Merge "ASoC: codecs: Update internal codec as split codecs"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 21 Dec 2016 07:44:57 +0000 (23:44 -0800)

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

Wed, 21 Dec 2016 07:44:57 +0000 (23:44 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 21 Dec 2016 07:44:57 +0000 (23:44 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 21 Dec 2016 07:44:57 +0000 (23:44 -0800)
diff --cc sound/soc/msm/msmfalcon-common.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 21 Dec 2016 07:44:57 +0000 (23:44 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 21 Dec 2016 07:44:57 +0000 (23:44 -0800)