Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sun, 31 May 2015 00:16:01 +0000 (20:16 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 31 May 2015 00:16:01 +0000 (20:16 -0400)
commit43b1ff5f33456e85b2fccccaf2f9fe09821a45ac
tree0e75720408e20f807f250c7cf862c780f2a68b41
parentb1f7ecc9b5f0ce07691f6804f436fcaa2a377b26
parentfcb2525d373f7a5bab213e8a89681bd3b7d09c44
Merge branch 'master' of git://git.denx.de/u-boot-uniphier