Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Thu, 30 Jun 2011 03:38:41 +0000 (20:38 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 30 Jun 2011 03:38:41 +0000 (20:38 -0700)

Trivial merge