4.0-8723 vs. 4.0-8721 / ogl-lin-mesa / chibi-robo-zfighting

4.0-8723 (51a36f27) Diff 4.0-8721 (38875e56)
9f768c9290aac6f4e0a5a5d2b4ff2ddaca3694fd Waiting for diff... e4863f835c7a1c6ab31974b3056e8aefb23ea897
741f6c34bd7c88eb33aa8577e46ec623a23a1da3 Waiting for diff... 2cc0f44a66b58dd6a09a4aad07d03e07e6d346c1
741f6c34bd7c88eb33aa8577e46ec623a23a1da3 Waiting for diff... 2cc0f44a66b58dd6a09a4aad07d03e07e6d346c1
55d2b0a26b9952b342985cf8c5c64d017f9c21ec Waiting for diff... 8833805bb563c889840cccb514594b2386ba9891