pr-12995-af499f vs. 2407-177 / sw-lin-mesa / melee-lighting

pr-12995-af499f (af499f37) Diff 2407-177 (e4bd1425)
c8e32fe1bfe865bd44ad8449e7ca578a7c776048 Waiting for diff... ee8218a56b9528665af48b25e00d7f146302d671
40f43a4d49a5f7af3a912ae500e8389d37625ca6 Waiting for diff... 0d40f53d46aea01e4b65192cafba225d6829b3e3
33ec6c9d5d8203fb81b29d52c366be52ee8ef1d4 Waiting for diff... b2c417b7b2a556e0c1d5d65ec2ea3c149ac25569