Merge commit 'keithp/drm-intel-next' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Mon, 22 Jun 2009 05:14:55 +0000 (22:14 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 22 Jun 2009 05:33:15 +0000 (22:33 -0700)

Trivial merge