diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 16:35:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 16:35:13 +0200 |
| commit | 8013e8c7117d9d54e84d80480b105f80603d9945 (patch) | |
| tree | 247d4b589c0323a94a8bbbe4ac4f00760d4363fb /MAINTAINERS | |
| parent | 3b0b8ec99aadea710f3dece74c95523463c0087a (diff) | |
| parent | f7b98477f613a69b74ba4a715856630cc6508c0d (diff) | |
| download | linux-stable-8013e8c7117d9d54e84d80480b105f80603d9945.tar.gz linux-stable-8013e8c7117d9d54e84d80480b105f80603d9945.tar.bz2 linux-stable-8013e8c7117d9d54e84d80480b105f80603d9945.zip | |
Merge tag 'renesas-maintainers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
Merge "Renesas ARM Based SoC Maintainers Updates for v3.18" from Simon Horman:
* Remove genmai_defconfig from MAINTAINERS
genmai_defconfig was removed in v3.17-rc1.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-maintainers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove genmai_defconfig from MAINTAINERS
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aefa94841ff3..99b78075a50c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1355,7 +1355,6 @@ F: arch/arm/boot/dts/sh* F: arch/arm/configs/ape6evm_defconfig F: arch/arm/configs/armadillo800eva_defconfig F: arch/arm/configs/bockw_defconfig -F: arch/arm/configs/genmai_defconfig F: arch/arm/configs/koelsch_defconfig F: arch/arm/configs/kzm9g_defconfig F: arch/arm/configs/lager_defconfig |