4.0-6807 vs. 4.0-6805 / ogl-lin-mesa / chibi-robo-zfighting

4.0-6807 (f75b1024) Diff 4.0-6805 (156fb821)
4bb694ea992833dfbe7c6a7159d7e84b826e08fd Waiting for diff... 85a72bb8415444c59cd307225691d08595ec013f
d5bc011eb4fffa9ff5c17152671f21ce0fa2ed09 Waiting for diff... 4a7228d726011f08c92cfc29b4bf30825b1e01a6
d5bc011eb4fffa9ff5c17152671f21ce0fa2ed09 Waiting for diff... 4a7228d726011f08c92cfc29b4bf30825b1e01a6
614c6ff88eca3f35d3bc32982055b16361d00aaa Waiting for diff... ee049aaeae0f7eb36274ebfc2fbf6507a1104f30