pr-13346-0e83f7 vs. 2412-270 / vk-lin-mesa / chibi-robo-zfighting

pr-13346-0e83f7 (0e83f753) Diff 2412-270 (c770e7c2)
6a02de7a60d6cafa7dd9e4fcba04415d469b3948 Waiting for diff... 9376da6012fccb6cee8b6ab4e485ae9ad0d1a3b6
7e06ed0e3630bc5072bc2481dbaf42a4cdbe9b6b Waiting for diff... 2d3e5ed6af98a2e821383bdbb41ec8b9e280afd5
0b56aa3c1b89c6617f89cdbf2e4849921da71e21 Waiting for diff... 30b9cf18171dd28faaf7a73a39b570ef348c2cfb