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)
commit95e0d11f2dba54c1b0066e414d2b88a95908da9e
tree90e16c61ae130899195bf20dbdba97fa90b2345d
parent4b3c3be024cc4a9f0cfdc97a068e6dd46da12e74
parent46bbd43fa44fe083188f3e4846ba5b8d3c89bae6
Merge branch 'defconfig2' of git://git./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