Merge branch 'topic/soix' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 18 Jun 2014 09:44:05 +0000 (11:44 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 18 Jun 2014 09:44:05 +0000 (11:44 +0200)
commit5d0cf3d6e07957502dae8602e2f96eb6790ddc13
tree6360d831a14c8e3344dc60034c0458a151d591d6
parent27b6c122512ca30399bb1b39cc42eda83901f304
parent8abdc17941c71b37311bb93876ac83dce58160c8
Merge branch 'topic/soix' into drm-intel-next-queued

Jesse's SOix work required some patches from acpi-next, so pull it in
through a topic barnch.

Conflicts:
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_uncore.c