Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Wed, 1 Jul 2015 19:37:56 +0000 (15:37 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 1 Jul 2015 19:37:56 +0000 (15:37 -0400)
commit6762ae68887d962e1a4be193672005bdefd3ee32
tree5fd64361a67785ea5dc57a7759ae7b14a55d1956
parentaf6da69f47314e0e8efa3711ffadbfda8d2334aa
parent8101b98298c4232175d0d7b4c73d94b66b97ef83
Merge branch 'master' of git://git.denx.de/u-boot-uniphier