tree 80b4a779130a477680a72109257fb8c19d66cf22
parent 9a170caed6fce89da77852575a7eee7dbadee332
parent abb295f3b3db602f91accf58b526b30b48673af1
author Dave Airlie <airlied@redhat.com> 1286327448 +1000
committer Dave Airlie <airlied@redhat.com> 1286327448 +1000

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