diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2015-01-21 18:25:46 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2015-01-21 18:25:46 +0800 |
| commit | a75a9be056d724f803263f031eeff008d8fe40d8 (patch) | |
| tree | 4b3e9f86c8447200a32967bdef27bc6d6fc2e96f /MAINTAINERS | |
| parent | 6d48b36adf76c362a4b6e23ecbf23ed0dfa661a8 (diff) | |
| parent | 326dc1f1f301eaaf91619c359b85cd98c2ff4374 (diff) | |
Merge remote-tracking branch 'remotes/linaro/linux-linaro-lsk-v3.14-android' into imx_3.14.y_android_linaro
Conflicts:
Documentation/devicetree/bindings/power/power_domain.txt
drivers/base/power/domain.c
drivers/cpufreq/Kconfig
drivers/cpufreq/cpufreq_interactive.c
drivers/mmc/core/core.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
include/linux/cpufreq.h
include/linux/pm_domain.h
include/trace/events/cpufreq_interactive.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 17fa05705e39..58fb9ebdf6d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -849,6 +849,14 @@ M: Hubert Feurstein <hubert.feurstein@contec.at> S: Maintained F: arch/arm/mach-ep93xx/micro9.c +ARM/CORESIGHT FRAMEWORK AND DRIVERS +M: Mathieu Poirier <mathieu.poirier@linaro.org> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: drivers/coresight/* +F: Documentation/trace/coresight.txt +F: Documentation/devicetree/bindings/arm/coresight.txt + ARM/CORGI MACHINE SUPPORT M: Richard Purdie <rpurdie@rpsys.net> S: Maintained @@ -5511,6 +5519,14 @@ S: Maintained F: drivers/net/macvlan.c F: include/linux/if_macvlan.h +MAILBOX API +M: Jassi Brar <jassisinghbrar@gmail.com> +L: linux-kernel@vger.kernel.org +S: Maintained +F: drivers/mailbox/ +F: include/linux/mailbox_client.h +F: include/linux/mailbox_controller.h + MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 M: Michael Kerrisk <mtk.manpages@gmail.com> W: http://www.kernel.org/doc/man-pages |