summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-04-13 18:44:59 -0400
committerOlof Johansson <olof@lixom.net>2016-04-13 18:44:59 -0400
commitc323061e4201d22bb72d3ed65044751b344a52a7 (patch)
tree53d2d172fbff70743cf85e75fe8c663eb267cc63 /MAINTAINERS
parent49ad80df2629a4627d2d8efe544c58ed0798c902 (diff)
parent33406c805730377ff48741f9ad99e7aada91595b (diff)
Merge tag 'sti-soc-for-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/soc
Highlights: ----------- - Add CPUFreq and RProc drivers to STI maintainers file list - Improve STi's menuconfig help entry * tag 'sti-soc-for-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti: ARM: STi: Update platform level menuconfig 'help' MAINTAINERS: Add ST's Remote Processor Driver to ARM/STI ARCHITECTURE MAINTAINERS: Add ST's CPUFreq driver to the STI file list Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 61a323a6b2cf..5d4286c7e42c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1638,6 +1638,7 @@ F: arch/arm/boot/dts/sti*
1638F: drivers/char/hw_random/st-rng.c 1638F: drivers/char/hw_random/st-rng.c
1639F: drivers/clocksource/arm_global_timer.c 1639F: drivers/clocksource/arm_global_timer.c
1640F: drivers/clocksource/clksrc_st_lpc.c 1640F: drivers/clocksource/clksrc_st_lpc.c
1641F: drivers/cpufreq/sti-cpufreq.c
1641F: drivers/i2c/busses/i2c-st.c 1642F: drivers/i2c/busses/i2c-st.c
1642F: drivers/media/rc/st_rc.c 1643F: drivers/media/rc/st_rc.c
1643F: drivers/media/platform/sti/c8sectpfe/ 1644F: drivers/media/platform/sti/c8sectpfe/
@@ -1647,6 +1648,7 @@ F: drivers/phy/phy-miphy365x.c
1647F: drivers/phy/phy-stih407-usb.c 1648F: drivers/phy/phy-stih407-usb.c
1648F: drivers/phy/phy-stih41x-usb.c 1649F: drivers/phy/phy-stih41x-usb.c
1649F: drivers/pinctrl/pinctrl-st.c 1650F: drivers/pinctrl/pinctrl-st.c
1651F: drivers/remoteproc/st_remoteproc.c
1650F: drivers/reset/sti/ 1652F: drivers/reset/sti/
1651F: drivers/rtc/rtc-st-lpc.c 1653F: drivers/rtc/rtc-st-lpc.c
1652F: drivers/tty/serial/st-asc.c 1654F: drivers/tty/serial/st-asc.c