Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 11 Sep 2010 08:49:58 +0000 (09:49 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Sat, 11 Sep 2010 08:49:58 +0000 (09:49 +0100)

Trivial merge