]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9c75b3c1d525173ea004a191b8c42208d978ce77
tree33c02b5e18e79756005a3edfa7c862a47de668d5
parentf0dd103e81ef66dd01a83ad9c42261d84b6af208
parent93cc5759c75b401e07730bfa4b2146aee17f107a
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