Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Mon, 27 Jun 2011 02:12:00 +0000 (19:12 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 27 Jun 2011 02:12:00 +0000 (19:12 -0700)

Trivial merge