Merge "ASoC: msm: fix ULL playback over a2dp"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 21 Dec 2016 15:30:25 +0000 (07:30 -0800)

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

Wed, 21 Dec 2016 15:30:24 +0000 (07:30 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 21 Dec 2016 15:30:25 +0000 (07:30 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 21 Dec 2016 15:30:24 +0000 (07:30 -0800)
diff --cc sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 21 Dec 2016 15:30:25 +0000 (07:30 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 21 Dec 2016 15:30:24 +0000 (07:30 -0800)