Merge remote branch 'korg/drm-fixes' into drm-vmware-next
authorDave Airlie <airlied@redhat.com>
Wed, 6 Oct 2010 01:10:48 +0000 (11:10 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 6 Oct 2010 01:10:48 +0000 (11:10 +1000)
commitfb7ba2114bcd8bb51640c20bc68f89164b29b9ed
tree80b4a779130a477680a72109257fb8c19d66cf22
parent9a170caed6fce89da77852575a7eee7dbadee332
parentabb295f3b3db602f91accf58b526b30b48673af1
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
MAINTAINERS
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_vm.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
include/drm/drmP.h