diff options
author | Olof Johansson <olof@lixom.net> | 2016-11-17 23:38:27 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-11-17 23:38:27 -0800 |
commit | 5589d62484ccd3f4e83e449095d5ac810a7cfba2 (patch) | |
tree | abe447259b4c11f88dd5a2401c9ed5be9d926735 /MAINTAINERS | |
parent | 7558341659e1b76e5c58345ab699a7ea1c6a9326 (diff) | |
parent | bd4760ca03156731674a570e44490986189d8228 (diff) | |
download | op-kernel-dev-5589d62484ccd3f4e83e449095d5ac810a7cfba2.zip op-kernel-dev-5589d62484ccd3f4e83e449095d5ac810a7cfba2.tar.gz |
Merge tag 'qcom-drivers-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Qualcomm ARM Based Driver Updates for v4.10
* Fixup QCOM SCM to use devm_reset_controller_register
* Add QCOM pinctrl to Qualcomm MAINTAINERS entry
* Add PM8994 regulator definitions
* Add stub for WCNSS_CTRL API
* tag 'qcom-drivers-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
firmware: qcom: scm: Use devm_reset_controller_register()
MAINTAINERS: add drivers/pinctrl/qcom to ARM/QUALCOMM SUPPORT
pinctrl: pm8994: add pad voltage regulator defines
soc: qcom: wcnss_ctrl: Stub wcnss_ctrl API
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c447953..7b3256a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1600,6 +1600,7 @@ F: arch/arm/mach-qcom/ F: arch/arm64/boot/dts/qcom/* F: drivers/i2c/busses/i2c-qup.c F: drivers/clk/qcom/ +F: drivers/pinctrl/qcom/ F: drivers/soc/qcom/ F: drivers/spi/spi-qup.c F: drivers/tty/serial/msm_serial.h |