Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 20:47:53 +0000 (13:47 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 20:47:53 +0000 (13:47 -0700)

Trivial merge