Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@ti.com>
Mon, 3 Nov 2014 17:43:42 +0000 (12:43 -0500)
committerTom Rini <trini@ti.com>
Mon, 3 Nov 2014 17:43:42 +0000 (12:43 -0500)
1  2 
arch/arm/cpu/armv7/uniphier/Kconfig

Simple merge