Merge remote branch 'linus' into drm-intel-fixes
authorChris Wilson <[email protected]>
Mon, 22 Nov 2010 08:47:43 +0000 (08:47 +0000)
committerChris Wilson <[email protected]>
Mon, 22 Nov 2010 08:47:43 +0000 (08:47 +0000)

Trivial merge