Merge branch 'defconfig2' of...

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

From Simon Horman, two more defconfig updates for shmobile.

* 'defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: mackerel:  enable VFP in defconfig
  ARM: mach-shmobile: armadillo: defconfig: Enable CEU