Merge "msm: ipa3: halt modem channels as part of SSR"

author Linux Build Service Account <lnxbuild@localhost>

Fri, 24 Feb 2017 05:35:59 +0000 (21:35 -0800)

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

Fri, 24 Feb 2017 05:35:59 +0000 (21:35 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Fri, 24 Feb 2017 05:35:59 +0000 (21:35 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Fri, 24 Feb 2017 05:35:59 +0000 (21:35 -0800)
diff --cc drivers/platform/msm/ipa/ipa_v3/ipa.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Fri, 24 Feb 2017 05:35:59 +0000 (21:35 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Fri, 24 Feb 2017 05:35:59 +0000 (21:35 -0800)