Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Oct 2010 09:07:38 +0000 (10:07 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Oct 2010 09:07:38 +0000 (10:07 +0100)

Trivial merge