Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Tue, 12 Jul 2011 17:40:25 +0000 (10:40 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 12 Jul 2011 17:40:25 +0000 (10:40 -0700)

Trivial merge