drivers/gpu/drm/i915/intel_display.c · 1c6e6d91b22c4271e8a5dab559a08cb005a77073 · Kirill Smelkov / linux

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

Dave Airlie authored Oct 08, 2009

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

c1176d6f

intel_display.c 124 KB

Replace intel_display.c