Merge branch 'master' of git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 31 Mar 2015 15:45:36 +0000 (11:45 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 31 Mar 2015 15:45:36 +0000 (11:45 -0400)
1  2 
arch/arm/Kconfig

Simple merge