Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 3 Aug 2011 17:41:19 +0000 (10:41 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 3 Aug 2011 17:41:19 +0000 (10:41 -0700)

Trivial merge