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
..
drm	Merge remote branch 'korg/drm-fixes' into drm-vmware-next	2010-10-06 11:10:48 +10:00
vga	vgaarb: trivial fix	2010-09-24 10:13:44 +10:00
Makefile