diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-03 10:56:11 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-03 10:56:11 +0100 |
| commit | 58e10eb92d36a62568349d985c9140d9be16a99c (patch) | |
| tree | 6ffaf65e64db390f6a28c1dca8c43d4eb1493f94 /kernel/resource.c | |
| parent | drm/i915: Don't mask the return code whilst relocating. (diff) | |
| parent | drm/i915: Use pipe state to tell when pipe is off (diff) | |
| download | wireguard-linux-58e10eb92d36a62568349d985c9140d9be16a99c.tar.xz wireguard-linux-58e10eb92d36a62568349d985c9140d9be16a99c.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
Diffstat (limited to 'kernel/resource.c')
0 files changed, 0 insertions, 0 deletions