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)
commita8b972bfa82c0391aaba809f29e351507fd28215
tree3d8361220256d45bc0bdc7225f40b225ab6b5e7e
parent130aec779ad9a2e28dc9d42ca5b367b957f311d7
parentd9bc8fd1cb35feb2802ac1d4d39a1deabf0c3d79
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
arch/arm/cpu/armv7/uniphier/Kconfig