Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 28 Sep 2010 14:48:38 +0000 (15:48 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 28 Sep 2010 14:48:38 +0000 (15:48 +0100)

Trivial merge