Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Fri, 22 Jul 2011 20:40:42 +0000 (13:40 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 22 Jul 2011 20:40:42 +0000 (13:40 -0700)

Trivial merge