Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 14 Dec 2010 11:34:51 +0000 (11:34 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 14 Dec 2010 11:34:51 +0000 (11:34 +0000)

Trivial merge