Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Wed, 10 Dec 2014 14:07:25 +0000 (09:07 -0500)
committerTom Rini <trini@ti.com>
Wed, 10 Dec 2014 14:07:25 +0000 (09:07 -0500)
1  2 
arch/arm/Kconfig

Simple merge