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

pr-13346-0e83f7 (0e83f753) Diff 2412-270 (c770e7c2)
437e1e0f84120191eda535c24828dc19b7329da0 Waiting for diff... 89142dc2d4895d9222d12293e1fa35ef97e4ee82
135777a7e031cf3f43e1a825f5773f815b02b853 Waiting for diff... 3ca25f16ab63a6aa93cd1cdad42f1fa73f42ae19
fbf5bcde3372ef59bc7aa10e4e631975d15a06c8 Waiting for diff... 9feea1ee8799aa99c0c6c351a6a8fabd3d548bf0