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

This commit is contained in:
Keith Packard 2011-07-01 13:33:49 -07:00
commit a7f08958d7