Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Fri, 1 Jul 2016 21:43:06 +0000 (17:43 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Jul 2016 21:43:06 +0000 (17:43 -0400)
commit20a41043fb3985879ec2ce2ef1deddcda7fa4c99
tree0a3c53dccba6b5ef1835a10039fdaa9ad4214c9a
parentd90bb439335386b3ae6ada89b89720cc66ec9352
parente64a6b11411befbaf166443d02d8b10e06852f6a
Merge branch 'master' of git://git.denx.de/u-boot-uniphier