Merge remote branch 'airlied/drm-core-next' into tmp
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 19 Oct 2010 08:13:00 +0000 (09:13 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 19 Oct 2010 08:14:50 +0000 (09:14 +0100)

Trivial merge