Merge branch 'defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorOlof Johansson <olof@lixom.net>
Tue, 29 Jan 2013 17:00:24 +0000 (09:00 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 29 Jan 2013 17:00:24 +0000 (09:00 -0800)
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


Trivial merge