Merge "icnss: Avoid DOMAIN_ATTR_ATOMIC setting during S1 bypass"

author Linux Build Service Account <lnxbuild@localhost>

Fri, 10 Feb 2017 06:09:23 +0000 (22:09 -0800)

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

Fri, 10 Feb 2017 06:09:23 +0000 (22:09 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Fri, 10 Feb 2017 06:09:23 +0000 (22:09 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Fri, 10 Feb 2017 06:09:23 +0000 (22:09 -0800)
diff --cc arch/arm/boot/dts/qcom/sdm630.dtsi
Simple merge
diff --cc arch/arm/boot/dts/qcom/sdm660.dtsi
Simple merge
diff --cc drivers/soc/qcom/icnss.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Fri, 10 Feb 2017 06:09:23 +0000 (22:09 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Fri, 10 Feb 2017 06:09:23 +0000 (22:09 -0800)
		1	2
arch/arm/boot/dts/qcom/sdm630.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/qcom/sdm660.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/soc/qcom/icnss.c	patch \|	diff1 \|	diff2 \|	blob \| history