Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 13 Apr 2015 14:52:46 +0000 (10:52 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 13 Apr 2015 14:52:46 +0000 (10:52 -0400)
1  2 
arch/arm/Kconfig

Simple merge