Merge branch 'defconfig' of...

Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Defconfig updates for shmobile platforms, from Simon Horman.

* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: mach-shmobile: kzm9d: update defconfig
  ARM: mach-shmobile: armadillo: update defconfig
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: fix memory size for kota2_defconfig
  ARM: mach-shmobile: mackerel: update defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>