am c23dbc41: (-s ours) am 55d470d3: wingray: update kernel -- DO NOT MERGE

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