am e1082e80: (-s ours) am e98ae677: am 8a27da99: wingray: update kernel -- DO NOT MERGE

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