]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-next' of ../drm-next into drm-linus
authorDave Airlie <airlied@redhat.com>
Thu, 8 Oct 2009 04:03:05 +0000 (14:03 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 8 Oct 2009 04:03:05 +0000 (14:03 +1000)
commit029fff59eedbfa9ae33c9a4c2377a125e2e99977
treef9796cf97a6fbc75a486b1e4f6406d1f8f599a48
parent3d1d5e6f216c3fc4e28622d4db781c17b25d72d7
parenta21908ecac63369114a1dcc52a087001047cf18f
Merge branch 'drm-next' of ../drm-next into drm-linus

conflict in radeon since new init path merged with vga arb code.

Conflicts:
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600d.h
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/radeon_device.c
include/drm/drm_pciids.h