diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 07:49:30 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 07:49:30 +0100 |
| commit | c94f28c383f58c9de74678e0f1624db9c5f8a8cb (patch) | |
| tree | 3281184f026cb79cee6c20fe29c994ba654cbbe4 /drivers/char/agp/ati-agp.c | |
| parent | drm/i915: Fix current tiling check for relaxed fencing (diff) | |
| parent | Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes (diff) | |
| download | linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.tar.xz linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/char/agp/ati-agp.c')
0 files changed, 0 insertions, 0 deletions