From: Tom Rini <trini@konsulko.com>
Date: Sun, 3 Jan 2016 15:32:24 +0000 (-0500)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: v2025.01-rc5-pxa1908~10824
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-logo.png?a=commitdiff_plain;h=f1993ca066100fcaba7d49fecae0ef604e5807e2;p=u-boot.git

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

f1993ca066100fcaba7d49fecae0ef604e5807e2