Merge tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:02:34 +0000 (16:02 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:02:34 +0000 (16:02 +0200)
commitaea843bc38562332ffdf73629fc01b6b74f71020
treea7d1d960cb5842b576d1083a1ec380ca1ee27c09
parent049e6dde7e57f0054fdc49102e7ef4830c698b46
parent0a8b0695f4c490c349ee12956d6946576c44a419
Merge tag 'renesas-defconfig-for-v4.4' of git://git./linux/kernel/git/horms/renesas into next/defconfig

Merge "Renesas ARM Based SoC Defconfig Updates for v4.4" from Simon Horman:

* Remove now non-existent MACH_MARZEN from defconfigs

* tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Remove Marzen
  ARM: shmobile: Remove Marzen from shmobile_defconfig