Merge remote branch 'linus' into drm-intel-fixes
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 08:14:55 +0000 (09:14 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 21 Sep 2010 08:14:55 +0000 (09:14 +0100)

Trivial merge