am 0bd6fbd2: (-s ours) am d13ffc7d: am 62404021: wingray: update kernel -- DO NOT MERGE

* commit '0bd6fbd2dcefd1862f18d66dd02fc81b89ce04da':