Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Fri, 17 Jun 2016 13:33:06 +0000 (09:33 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 17 Jun 2016 13:33:06 +0000 (09:33 -0400)
commit232d77e7238e41779f952094b302c47caea4d159
treebf8e2abb033786be41b02990be70b43aa344ea98
parent1736121b24f0cf05b08bac03035b9d34d52a5d99
parent1cb075c6c6ce1a46c3423e63013686e74457275c
Merge branch 'master' of git://git.denx.de/u-boot-ubi