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

This commit is contained in:
Keith Packard 2011-06-25 17:08:13 -07:00
commit 93dbb29b47