Merge "ASoC: wcd934x: Do not prevent the core entering power collapse"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 15 Feb 2017 14:11:38 +0000 (06:11 -0800)

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

Wed, 15 Feb 2017 14:11:38 +0000 (06:11 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 15 Feb 2017 14:11:38 +0000 (06:11 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 15 Feb 2017 14:11:38 +0000 (06:11 -0800)
diff --cc sound/soc/codecs/wcd934x/wcd934x.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 15 Feb 2017 14:11:38 +0000 (06:11 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 15 Feb 2017 14:11:38 +0000 (06:11 -0800)