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

Trivial merge