Merge "ASoC: wcd-mbhc: disable fake electrical interrupts"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 7 Sep 2016 10:21:41 +0000 (03:21 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Wed, 7 Sep 2016 10:21:41 +0000 (03:21 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 7 Sep 2016 10:21:41 +0000 (03:21 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 7 Sep 2016 10:21:41 +0000 (03:21 -0700)
diff --cc sound/soc/codecs/wcd-mbhc-v2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 7 Sep 2016 10:21:41 +0000 (03:21 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 7 Sep 2016 10:21:41 +0000 (03:21 -0700)