diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-18 14:45:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-18 14:45:01 -0700 |
| commit | 2a4c145478710623dd3591bab4909e0b7f710d14 (patch) | |
| tree | 899f688f03d0265300f93d57e0010c28f226a499 /MAINTAINERS | |
| parent | 1f2e1c0bae00a8e6c0f64cb314b5460f0e0cc4dc (diff) | |
| parent | 4cfab57e47079482dd0350a1912b0c38823f76aa (diff) | |
Merge branch 'next/cleanup' into for-next
* next/cleanup:
MAINTAINERS: Remove Kirkwood
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c56d7d1f8522..b6deff7f39e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1097,14 +1097,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-berlin/ -ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support +ARM/Marvell Dove/MV78xx0/Orion SOC support M: Jason Cooper <jason@lakedaemon.net> M: Andrew Lunn <andrew@lunn.ch> M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-dove/ -F: arch/arm/mach-kirkwood/ F: arch/arm/mach-mv78xx0/ F: arch/arm/mach-orion5x/ F: arch/arm/plat-orion/ |