am 05ea8ca1: (-s ours) am df5321c1: am 31f18bd9: wingray: update kernel -- DO NOT MERGE

* commit '05ea8ca1a51b046a210f73e94c7e21541f87c0a7':
  wingray: update kernel -- DO NOT MERGE