Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Mon, 25 Jul 2011 21:57:41 +0000 (14:57 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 25 Jul 2011 21:57:41 +0000 (14:57 -0700)

Trivial merge