| commit | 710f957846cff998c681f3701f6f90eda896458f | |
| author | Chris Wilson <chris@chris-wilson.co.uk> | |
| Tue, 22 Feb 2011 15:58:46 +0000 (22 15:58 +0000) | ||
| committer | Chris Wilson <chris@chris-wilson.co.uk> | |
| Tue, 22 Feb 2011 16:09:03 +0000 (22 16:09 +0000) | ||
| tree | ba22ee7b469dd0cee974019cc32630838691f3af | treesnapshot (tar.gz zip) |
| parent | e953fd7bb32f55309a96abd5ceba9cf68d221434 | commitdiff |
| parent | 011b9910bdaf2e52c48c012490ab444fceea1959 | commitdiff |
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge in the conflicting eDP fix.
Conflicts:
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Merge in the conflicting eDP fix.
Conflicts:
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| drivers/gpu/drm/i915/i915_reg.h | diff1 | diff2 | blobhistory |
| drivers/gpu/drm/i915/intel_panel.c | diff1 | diff2 | blobhistory |