Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)
committerTom Rini <trini@ti.com>
Mon, 24 Nov 2014 22:05:11 +0000 (17:05 -0500)
1  2 
Kconfig
arch/arm/Kconfig

diff --cc Kconfig
Simple merge
Simple merge