am c6d1352e: (-s ours) am 167a2697: am 5502d0f5: wingray: update kernel -- DO NOT MERGE

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