From: Tom Rini <trini@ti.com>
Date: Wed, 4 Feb 2015 18:30:00 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ubi
X-Git-Tag: KARO-TXSD-2017-03-15~5404
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f641d53bbb3a426a3bfb132d8346153e86a9d08;p=karo-tx-uboot.git

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

7f641d53bbb3a426a3bfb132d8346153e86a9d08