Merge "ASoC: msm8998: Add support for HiFi amplifier"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 7 Dec 2016 05:03:07 +0000 (21:03 -0800)

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

Wed, 7 Dec 2016 05:03:07 +0000 (21:03 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 7 Dec 2016 05:03:07 +0000 (21:03 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 7 Dec 2016 05:03:07 +0000 (21:03 -0800)
diff --cc arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 7 Dec 2016 05:03:07 +0000 (21:03 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 7 Dec 2016 05:03:07 +0000 (21:03 -0800)