pr-13100-87bd92 vs. 2409-95 / vk-lin-mesa / chibi-robo-zfighting

pr-13100-87bd92 (87bd920c) Diff 2409-95 (ae14abb2)
5868cac666cc078856e43cd320e79b4f524daf5c Waiting for diff... 9376da6012fccb6cee8b6ab4e485ae9ad0d1a3b6
743bf0b4689bf7886e2d19f6aa54559421bb21bf Waiting for diff... 2d3e5ed6af98a2e821383bdbb41ec8b9e280afd5
c0856c2314e8f9d993afd7e554615e5c3b6ef623 Waiting for diff... 30b9cf18171dd28faaf7a73a39b570ef348c2cfb