Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sun, 10 Jan 2016 14:17:52 +0000 (09:17 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 10 Jan 2016 14:17:52 +0000 (09:17 -0500)

Trivial merge