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

Trivial merge