diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:13:53 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:13:53 +0200 |
| commit | abb2c53a5536019f3af9917d00e5a9be6853e1f6 (patch) | |
| tree | 0a017b043e116d3b449d9040a8f13c086d71f8e1 /MAINTAINERS | |
| parent | MAINTAINERS: ARM/Amlogic: add co-maintainer, misc. updates (diff) | |
| parent | arm: Add Aspeed machine (diff) | |
| download | linux-abb2c53a5536019f3af9917d00e5a9be6853e1f6.tar.xz linux-abb2c53a5536019f3af9917d00e5a9be6853e1f6.zip | |
Merge tag 'aspeed-for-4.7-arch' of https://github.com/shenki/linux into next/soc
Merge "aspeed arch tag for 4.7" from Joel Stanley <joel@jms.id.au>:
This is the initial pull request for the Aspeed BMC SoCs.
I put 4.7 in the subject for this and the subsequent requests but if it's a bit
late in the cycle then I understand.
Following review I got rid of the board file by pushing the functionality out
to a watchdog and clock driver, so it's just the Kconfig bits. I've also added
myself to maintainers for the Aspeed arch and drivers as I intend on looking
after them.
* tag 'aspeed-for-4.7-arch' of https://github.com/shenki/linux:
arm: Add Aspeed machine
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c2a24f8e792d..690393950ec3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -978,6 +978,13 @@ F: arch/arm/mach-artpec F: arch/arm/boot/dts/artpec6* F: drivers/clk/clk-artpec6.c +ARM/ASPEED MACHINE SUPPORT +M: Joel Stanley <joel@jms.id.au> +S: Maintained +F: arch/arm/mach-aspeed/ +F: arch/arm/boot/dts/aspeed-* +F: drivers/*/*aspeed* + ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT M: Nicolas Ferre <nicolas.ferre@atmel.com> M: Alexandre Belloni <alexandre.belloni@free-electrons.com> |