Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Mon, 4 Jan 2016 15:53:50 +0000 (10:53 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 4 Jan 2016 15:53:50 +0000 (10:53 -0500)
commitf8a3df0fbc31e7f0f0a5359d505c07fd99b2dab3
tree9568b3bb2cc157b77fb298fe05df0026e48ed3db
parentf1993ca066100fcaba7d49fecae0ef604e5807e2
parent6a4595600b968bafcae8ad603bfc1175b6efe1d8
Merge branch 'master' of git://git.denx.de/u-boot-ubi