Merge branch 'drm-next' of ../drm-2.6 into drm-next
Dave Airlie [Wed, 4 Nov 2009 22:28:54 +0000 (08:28 +1000)]

Trivial merge