Dave Airlie c1176d6f03 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

2009-10-08 14:03:05 +10:00

40 KiB

Raw Blame History

View Raw