Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 2 Mar 2011 02:48:23 +0000 (12:48 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 2 Mar 2011 02:48:23 +0000 (12:48 +1000)

Trivial merge