diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 17:39:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 17:39:45 -0800 |
| commit | e33dbd659505371c41cce4abf3cf2d591dfb2b67 (patch) | |
| tree | f40b19f363a830eb332d0e3be940ffcee7b27e82 /MAINTAINERS | |
| parent | 9d3d1fc1f171d7349276c59281aaddad4c37ec31 (diff) | |
| parent | 874767e52cec4f5726ce11339b12cc08386cf88e (diff) | |
Merge branch 'next/drivers' into for-next
* next/drivers:
firmware: qcom_scm: Add set remote state API
MAINTAINERS: Update the files to include the Qualcomm DMA folder
bus: qcom_ebi2: default y if ARCH_QCOM
firmware: qcom: scm: Mask APQ8064 core clk dependency
firmware: qcom: scm: Add empty functions to help compile testing
soc: ti: wkup_m3_ipc: Drop wait from wkup_m3_rproc_boot_thread
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4dc8bfe1e33f..4fde275b2d38 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1625,6 +1625,7 @@ F: arch/arm64/boot/dts/qcom/* F: drivers/i2c/busses/i2c-qup.c F: drivers/clk/qcom/ F: drivers/pinctrl/qcom/ +F: drivers/dma/qcom/ F: drivers/soc/qcom/ F: drivers/spi/spi-qup.c F: drivers/tty/serial/msm_serial.h |