Merge branch 'drm-intel-next' of arrandale:git/linux-2.6 into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:56:33 +0000 (08:56 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:56:33 +0000 (08:56 +0000)

Trivial merge