From: Tom Rini <trini@konsulko.com>
Date: Mon, 4 Jan 2016 15:53:50 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ubi
X-Git-Tag: v2025.01-rc5-pxa1908~10823
X-Git-Url: http://git.dujemihanovic.xyz/img/html/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=f8a3df0fbc31e7f0f0a5359d505c07fd99b2dab3;p=u-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-ubi
---

f8a3df0fbc31e7f0f0a5359d505c07fd99b2dab3