Merge branch 'spear/multiplatform' into late/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 20:30:31 +0000 (22:30 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 20:50:01 +0000 (22:50 +0200)
commit1b361942b53c33f38d55065c13785aadb5103a18
tree07b26d32b175f27f18f1fca3d5944a58f89cd17f
parent61b464aef0e306f141dbc0bb3f9c58049a987a7e
parentbcf3e72eff584136600a51a5b30ef7a794664d19
Merge branch 'spear/multiplatform' into late/cleanup

This is a prerequisite for the spear/dwdma series.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig
arch/arm/mach-spear/Kconfig