]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 22 Feb 2011 15:58:46 +0000 (15:58 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 22 Feb 2011 16:09:03 +0000 (16:09 +0000)
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>
1  2 
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_panel.c

Simple merge
Simple merge