diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:11:20 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:11:20 +0200 |
commit | e2372a0f9a0cd3e10d3833020fb7afd54214d12f (patch) | |
tree | 39fe0e5fb16d21c660e3ec45a6e0f60dbf9a38f5 /arch/arm/configs/multi_v7_defconfig | |
parent | 143a84c298ce7d724d9ecbd1bf5adc4b51974e71 (diff) | |
parent | f1e9637f4b49690a6c5793f1745f743506b1bfd1 (diff) | |
parent | 9956dcc5d136248a415234381311543c8cdf869a (diff) |
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>