am 0ae4f405: (-s ours) am 837c2964: am 55d470d3: wingray: update kernel -- DO NOT MERGE

* commit '0ae4f405f0e99ada750d823c57d64de61f77f716':