From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 18 Jun 2014 09:44:05 +0000 (+0200)
Subject: Merge branch 'topic/soix' into drm-intel-next-queued
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~63^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d0cf3d6e07957502dae8602e2f96eb6790ddc13;p=pandora-kernel.git

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>
---

5d0cf3d6e07957502dae8602e2f96eb6790ddc13
Reading git-diff-tree failed