Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <[email protected]>
Fri, 8 Jan 2016 15:18:18 +0000 (10:18 -0500)
committerTom Rini <[email protected]>
Fri, 8 Jan 2016 15:18:18 +0000 (10:18 -0500)

Trivial merge