diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-02 10:53:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-02 10:53:29 +0000 |
| commit | 8c1812ad4879676bec1bd20f8ff478c8a076f3fc (patch) | |
| tree | 71460f036f5ed4c1c130c041b0db95f12213baa4 /drivers/gpu/drm/drm_debugfs.c | |
| parent | 8d19215be8254f4f75e9c5a0d28345947b0382db (diff) | |
| parent | 5588978882b5f4b81169bd7f9bc941e3a12ee8ba (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Immediate merge to resolve conflicts from applying a stability fix to
both branches.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h
Diffstat (limited to 'drivers/gpu/drm/drm_debugfs.c')
0 files changed, 0 insertions, 0 deletions