Merge branch 'drm-intel-fixes' into drm-intel-next

This commit is contained in:
Chris Wilson 2010-12-05 00:37:43 +00:00
commit 382ab78c0e