Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 21 Sep 2011 21:52:46 +0000 (14:52 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 21 Sep 2011 21:52:46 +0000 (14:52 -0700)

Trivial merge