Merge branch 'master' of git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 25 Jan 2016 15:40:38 +0000 (10:40 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 25 Jan 2016 15:40:38 +0000 (10:40 -0500)

Trivial merge