am 55b0b256: (-s ours) am 8d96f493: am 5502d0f5: wingray: update kernel -- DO NOT MERGE

* commit '55b0b256388deb0ac9721b01e6efe75c41d91045':