Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Mon, 13 Jun 2016 12:51:21 +0000 (08:51 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 13 Jun 2016 12:51:21 +0000 (08:51 -0400)
commitf4abfed1de34e3fa18be4a8a156416cd6ed21f4a
treef65c099f92ff6fe56989ac2773504cb2a4f497fd
parentfd9102dafea5c6959401d0dbc5293a56d2261878
parentc1f51e0f3edca57273ff524714b69345ce627996
Merge branch 'master' of git://git.denx.de/u-boot-ubi