Merge remote-tracking branch 'qcom/for-next'

diff --cc Documentation/devicetree/bindings/arm/cpus.txt
Simple merge

diff --cc MAINTAINERS
index ba0f059ce19df6e0e29922f32ace9e96b6814a41,5e58e828a99831f645b0685b45184222a3c135a9..2f511d6e71a16c0695ed6652da6c2b58cba2da4c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1451,8 -1425,10 +1451,11 @@@ S:    Maintaine
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
 +F:    arch/arm64/boot/dts/qcom/*
+ F:    drivers/i2c/busses/i2c-qup.c
+ F:    drivers/clk/qcom/
  F:    drivers/soc/qcom/
+ F:    drivers/spi/spi-qup.c
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge