Merge remote branch 'airlied/drm-core-next' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 16 Dec 2010 21:02:15 +0000 (21:02 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 16 Dec 2010 21:02:15 +0000 (21:02 +0000)

Trivial merge