Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@ti.com>
Thu, 11 Dec 2014 23:28:09 +0000 (18:28 -0500)
committerTom Rini <trini@ti.com>
Thu, 11 Dec 2014 23:28:09 +0000 (18:28 -0500)
1  2 
arch/arm/Kconfig

Simple merge