From: Tom Rini <trini@ti.com>
Date: Fri, 29 Aug 2014 15:06:51 +0000 (-0400)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: KARO-TXA5-2015-06-26~760
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=5a1095a830299aef8dd32495e505e92ab1749e89

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

5a1095a830299aef8dd32495e505e92ab1749e89