git » linux-kernel » commit c1176d6

Merge branch 'drm-next' of ../drm-next into drm-linus

author Dave Airlie
2009-10-08 04:03:05 UTC
committer Dave Airlie
2009-10-08 04:03:05 UTC
parent 0eca52a92735f43462165efe00a7e394345fb38e
parent d4ac6a05d51357e31028cc9076874a58dd197b83
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