Merge tag 'renesas-maintainers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kerne...
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 14:35:13 +0000 (16:35 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 14:35:13 +0000 (16:35 +0200)
commit8013e8c7117d9d54e84d80480b105f80603d9945
tree247d4b589c0323a94a8bbbe4ac4f00760d4363fb
parent3b0b8ec99aadea710f3dece74c95523463c0087a
parentf7b98477f613a69b74ba4a715856630cc6508c0d
Merge tag 'renesas-maintainers-for-v3.18' of git://git./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