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

This commit is contained in:
Keith Packard 2011-07-07 15:39:51 -07:00
commit 6fe5a7e3ca