diff options
author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-05-13 14:36:11 -0700 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-05-13 14:42:23 -0700 |
commit | f79a917e69e1f5cd86e864b67f06147f1b0340f4 (patch) | |
tree | 561675103ee8a220365e7c907e51d6c362727ff7 /MAINTAINERS | |
parent | ed7cbbce544856b20e5811de373cf92e92499771 (diff) | |
parent | b853cb9628bfbcc4017da46d5f5b46e3eba9d8c6 (diff) | |
download | op-kernel-dev-f79a917e69e1f5cd86e864b67f06147f1b0340f4.zip op-kernel-dev-f79a917e69e1f5cd86e864b67f06147f1b0340f4.tar.gz |
Merge tag 'qcom-soc-for-4.7-2' into net-next
This merges the Qualcomm SOC tree with the net-next, solving the
merge conflict in the SMD API between the two.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b57df66..1e13db3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1470,7 +1470,10 @@ 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???-* |