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)
commit4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd
tree33c02b5e18e79756005a3edfa7c862a47de668d5
parent4086b1e2b19729eebf632073b9d4ab811726d8eb
parentdc257cf154be708ecc47b8b89c12ad8cd2cc35e4
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

Daniel prepared this branch with a back-merge as git was getting
very confused about changes in intel_display.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/rv770.c
drivers/gpu/drm/radeon/si.c