diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-06 11:10:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-06 11:10:48 +1000 |
| commit | fb7ba2114bcd8bb51640c20bc68f89164b29b9ed (patch) | |
| tree | 80b4a779130a477680a72109257fb8c19d66cf22 /init | |
| parent | 9a170caed6fce89da77852575a7eee7dbadee332 (diff) | |
| parent | abb295f3b3db602f91accf58b526b30b48673af1 (diff) | |
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions