From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 26 Mar 2013 16:19:02 +0000 (-0700)
Subject: Merge tag 'arizona-extcon-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: upstream/snapshot3+hdmi~5292^2~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e58b9a25eeb89ab2ee05cd093f6d7bc2f34acb21;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'arizona-extcon-asoc' of git://git./linux/kernel/git/broonie/misc into char-misc-next

Mark writes:

	ASoC/extcon: arizona: Fix interaction between HPDET and headphone outputs

	This patch series covers both ASoC and extcon subsystems and fixes an
	interaction between the HPDET function and the headphone outputs - we
	really shouldn't run HPDET while the headphone is active.  The first
	patch is a refactoring to make the extcon side easier.
---

e58b9a25eeb89ab2ee05cd093f6d7bc2f34acb21