Merge tag 'arizona-extcon-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 16:19:02 +0000 (09:19 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 16:19:02 +0000 (09:19 -0700)
commite58b9a25eeb89ab2ee05cd093f6d7bc2f34acb21
tree40162c796bc60f00d062b37718dc62adc970ac07
parenta6025a2a861845447adeb7a11c3043039959d3a1
parentdf8c3dbee9e6f19ddb0ae8e05cdf76eb2d3b7f00
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.
MAINTAINERS
drivers/mfd/Kconfig