tree 39fe0e5fb16d21c660e3ec45a6e0f60dbf9a38f5
parent 143a84c298ce7d724d9ecbd1bf5adc4b51974e71
parent f1e9637f4b49690a6c5793f1745f743506b1bfd1
parent 9956dcc5d136248a415234381311543c8cdf869a
author Arnd Bergmann <arnd@arndb.de> 1400883080 +0200
committer Arnd Bergmann <arnd@arndb.de> 1400883080 +0200

Merge prior defconfig changes into next/defconfig

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>