]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-intel-next-fixes' into drm-intel-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 21 Oct 2014 12:32:55 +0000 (14:32 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 21 Oct 2014 12:42:30 +0000 (14:42 +0200)
commit12e37de8cb8cfa97e89e9e59726e8da109dc9b30
treee40a5ccc9fc808735f3426f5387e54e291ad4351
parent38a695e0b45660ab39eaa61376e2896ce2c20e14
parente40f4e51ba57fb6392713fa9c1a2f31149a7887c
Merge branch 'drm-intel-next-fixes' into drm-intel-next

So I've sent the first pull request to Dave and I expect his request
for a merge tree any second now ;-)

More seriously I have some pending patches for 3.19 that depend upon
both trees, hence backmerge. Conflicts are all trivial.

Conflicts:
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c

v2: Of course I've forgotten the fixup script for the silent conflict.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_ringbuffer.c