Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 4 Nov 2010 09:40:36 +0000 (09:40 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 4 Nov 2010 09:40:36 +0000 (09:40 +0000)

Trivial merge