Dave Airlie fb7ba2114b Merge remote branch 'korg/drm-fixes' into drm-vmware-next ...

necessary for some of the vmware fixes to be pushed in.

Conflicts:
	drivers/gpu/drm/drm_gem.c
	drivers/gpu/drm/i915/intel_fb.c
	include/drm/drmP.h

2010-10-06 11:10:48 +10:00

50 KiB

Raw Blame History

View Raw