From: Greg Kroah-Hartman 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: firefly_0821_release~3680^2~676^2~64 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e58b9a25eeb89ab2ee05cd093f6d7bc2f34acb21;p=firefly-linux-kernel-4.4.55.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