4.0-6341 vs. 4.0-6337 / ogl-lin-mesa / chibi-robo-zfighting

4.0-6341 (732802eb) Diff 4.0-6337 (34cd2b02)
e4863f835c7a1c6ab31974b3056e8aefb23ea897 Waiting for diff... c39bb77ec55770d3a0470194711fd8a9c286bcd7
2cc0f44a66b58dd6a09a4aad07d03e07e6d346c1 Waiting for diff... 9024610eaa427cae7e0886065d8cb1fff3a07468
2cc0f44a66b58dd6a09a4aad07d03e07e6d346c1 Waiting for diff... 9024610eaa427cae7e0886065d8cb1fff3a07468
8833805bb563c889840cccb514594b2386ba9891 Waiting for diff... 76553f14ad4f42ac6ecd453756dcc43330b73279