Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Fri, 29 Jul 2011 23:24:10 +0000 (16:24 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 29 Jul 2011 23:24:10 +0000 (16:24 -0700)

Trivial merge