Commit 8013e8c7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-maintainers-for-v3.18' of...

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: default avatarArnd 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
parents 3b0b8ec9 f7b98477
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment