diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 10:43:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 10:43:25 -0400 |
| commit | d64c5097ff1701ae54d02d36f68184756e6a80f0 (patch) | |
| tree | 15c2c7f83c72c47c01f2a236db752a31af613aeb /MAINTAINERS | |
| parent | 64685273186b71b75734771ca21823cec2d994c3 (diff) | |
| parent | 6f112a08c1ed717a015dae190e289d53085c1bc4 (diff) | |
Merge tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/soc
Merge "First little batch of SoC changes for 4.4" from Nicolas Ferre:
- a MAINTAINER addition to cover SAMA5 SoCs
- removal of one unneeded header file
- for low-level serial output, use the DEBUG_UART_PHYS
* tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: debug: use DEBUG_UART_PHYS
ARM: at91: remove useless includes in platform_data/atmel.h
MAINTAINERS: explicitly add Atmel SAMA5
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 797236befd27..cef312ddd49e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -917,7 +917,7 @@ M: Tsahee Zidenberg <tsahee@annapurnalabs.com> | |||
| 917 | S: Maintained | 917 | S: Maintained |
| 918 | F: arch/arm/mach-alpine/ | 918 | F: arch/arm/mach-alpine/ |
| 919 | 919 | ||
| 920 | ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES | 920 | ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT |
| 921 | M: Nicolas Ferre <nicolas.ferre@atmel.com> | 921 | M: Nicolas Ferre <nicolas.ferre@atmel.com> |
| 922 | M: Alexandre Belloni <alexandre.belloni@free-electrons.com> | 922 | M: Alexandre Belloni <alexandre.belloni@free-electrons.com> |
| 923 | M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> | 923 | M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> |