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)
commitc1176d6f03e1085797ce83648a2c76ae15a2b515
treef9796cf97a6fbc75a486b1e4f6406d1f8f599a48
parent0eca52a92735f43462165efe00a7e394345fb38e
parentd4ac6a05d51357e31028cc9076874a58dd197b83
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