am c88d0868: (-s ours) am 6afd0fdf: am 55d470d3: wingray: update kernel -- DO NOT MERGE

* commit 'c88d0868ff03824547b8976824f5d82309afedae':
  wingray: update kernel -- DO NOT MERGE