am 6bb9c14e: (-s ours) am 5b48eee5: am 62404021: wingray: update kernel -- DO NOT MERGE

* commit '6bb9c14e286db712f30a3ab2292b8bb7c727994f':
  wingray: update kernel -- DO NOT MERGE