Merge remote branch 'origin/drm-intel-next' of ../drm-intel into drm-fixes
authorDave Airlie <airlied@linux.ie>
Wed, 24 Jun 2009 06:20:19 +0000 (16:20 +1000)
committerDave Airlie <airlied@linux.ie>
Wed, 24 Jun 2009 06:20:19 +0000 (16:20 +1000)

Trivial merge