Merge remote branch 'linus' into drm-intel-fixes
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 13 Sep 2010 00:02:18 +0000 (01:02 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 13 Sep 2010 00:02:18 +0000 (01:02 +0100)

Trivial merge