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

Trivial merge