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

..

i810_dma.c

drm: i810/i830: fix locked ioctl variant

2010-09-30 12:45:09 +10:00

i810_drv.c

drm: kill get_reg_ofs callback

2010-08-30 09:44:56 +10:00

i810_drv.h

drm: kill BKL from common code

2010-08-05 11:54:40 +10:00

Makefile

drm: reorganise drm tree to be more future proof.

2008-07-14 10:45:01 +10:00