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