From: Tom Rini <trini@ti.com>
Date: Wed, 10 Dec 2014 14:07:25 +0000 (-0500)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: KARO-TXA5-2015-06-26~159
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326

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

9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326