From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 12 Jan 2015 22:07:46 +0000 (+0100)
Subject: Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~75^2~32^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a87a2db485a1456b7427914969c0e8195a1bbda;p=pandora-kernel.git

Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued

Conflicts:
	drivers/gpu/drm/i915/intel_runtime_pm.c

Separate branch so that Takashi can also pull just this refactoring
into sound-next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

0a87a2db485a1456b7427914969c0e8195a1bbda
Reading git-diff-tree failed