Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Tue, 30 Dec 2014 17:17:18 +0000 (12:17 -0500)
committerTom Rini <trini@ti.com>
Tue, 30 Dec 2014 17:17:18 +0000 (12:17 -0500)

Trivial merge