Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sat, 29 Oct 2016 21:15:24 +0000 (17:15 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 29 Oct 2016 21:15:24 +0000 (17:15 -0400)
commit9f375f655fa54f88fdbe35d3f0c3bd6c1a91671b
tree4882d126727475838107873a5c02c39ff419ecd8
parent4d6afd69babafbf6580cb04dacd9479df03a5de0
parent6eeb624148c1aaedd1cf4f89286c7719bb140fd0
Merge branch 'master' of git://git.denx.de/u-boot-uniphier