Merge prior defconfig changes into next/defconfig
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:11:20 +0000 (00:11 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:11:20 +0000 (00:11 +0200)
These are from the next/boards branch, and we decided to split
out the defconfig changes now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge