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

This commit is contained in:
Chris Wilson 2010-12-14 11:34:51 +00:00
commit 9097eef024