Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into...
authorDave Airlie <airlied@redhat.com>
Mon, 7 May 2012 15:09:09 +0000 (16:09 +0100)
committerDave Airlie <airlied@redhat.com>
Mon, 7 May 2012 15:09:35 +0000 (16:09 +0100)
Daniel prepared this branch with a back-merge as git was getting
very confused about changes in intel_display.c


Trivial merge