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

Trivial merge