Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Tue, 24 Mar 2015 14:50:16 +0000 (10:50 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 24 Mar 2015 14:50:16 +0000 (10:50 -0400)
commit3c0c1f02d55db6681141cc4b125a9ddd47f6d4f3
tree4ee35ca5dc011b61cfbeb6414ae2acdc717fe4d6
parent8a440b09f21ab8ec72b3aedf4d6f3f53494d7149
parent90e357efed06767d87c49280bc25272fdf378612
Merge branch 'master' of git://git.denx.de/u-boot-uniphier