Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Tue, 14 Jul 2015 18:13:23 +0000 (14:13 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 14 Jul 2015 18:13:23 +0000 (14:13 -0400)
1  2 
arch/arm/Kconfig

Simple merge