Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 1 Mar 2011 23:20:20 +0000 (23:20 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 1 Mar 2011 23:20:20 +0000 (23:20 +0000)

Trivial merge