Merge "ASoC: wcd934x: Update codec master clock configuration"

author Linux Build Service Account <lnxbuild@localhost>

Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)

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

Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)
diff --cc sound/soc/codecs/wcd934x/wcd934x.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Mon, 5 Sep 2016 23:21:42 +0000 (16:21 -0700)