Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:30:38 +0000 (08:30 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:30:38 +0000 (08:30 -0400)
commit3c594d34c4addc962b2bd6ed2d16f3ce24ab1627
tree771baefba46fda48848257e6c5313e977ad07370
parent99615d812f1c5f954c8bbc1e0cdfcb15e5cbe675
parent4fb96c48c183128c00b21c7858bb05897a1b80de
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
arch/arm/Kconfig
include/configs/uniphier.h