compositor-drm: Fix bad rebase
authorKristian Høgsberg <krh@bitplanet.net>
Thu, 9 Aug 2012 21:19:23 +0000 (17:19 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 9 Aug 2012 21:19:23 +0000 (17:19 -0400)
commit8a01580f17c3a83cda0d4d16142b2324f237df23
treee94866ee59d3deaf6c6600ffbd1fbce6f2733eb0
parent711fda86cc9d6338dfa466057f3608d4f88af9c8
compositor-drm: Fix bad rebase

I failed to compile test my rebase of Robs compositor-drm fixes.
src/compositor-drm.c