am eef8db56: (-s ours) am d7032653: am 31f18bd9: wingray: update kernel -- DO NOT MERGE

* commit 'eef8db56c15f59296d1aa36aaeb99abc8a5af969':