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 /drivers/gpu/drm/radeon/r100.c | |
| parent | Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next (diff) | |
| parent | vmwgfx: Fix fb VRAM pinning failure due to fragmentation (diff) | |
| download | wireguard-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.tar.xz wireguard-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.zip | |
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 'drivers/gpu/drm/radeon/r100.c')
0 files changed, 0 insertions, 0 deletions