Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 9 Dec 2010 20:22:04 +0000 (20:22 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 9 Dec 2010 20:22:04 +0000 (20:22 +0000)

Trivial merge