]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/skl-stage1' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 30 Sep 2014 20:36:57 +0000 (22:36 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 30 Sep 2014 20:36:57 +0000 (22:36 +0200)
commit4bba8a6b22994da92b5cb5a10ea81e12155d5ff5
tree9913b327cc443e5eb3d399eafb9d460d9261d2f2
parent06d35b2b24a3bf448d8532c10b1cf1ac1f920ba3
parente8ef5bb6f2f0f58ef8d04f667fbe0e105bfb3664
Merge branch 'topic/skl-stage1' into drm-intel-next-queued

SKL stage 1 patches still need polish so will likely miss the 3.18
merge window. We've decided to postpone to 3.19 so let's pull this in
to make patch merging and conflict handling easier.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
19 files changed:
Documentation/DocBook/drm.tmpl
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.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
drivers/gpu/drm/i915/intel_sprite.c
drivers/gpu/drm/i915/intel_uncore.c