Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Tue, 22 Mar 2016 16:14:27 +0000 (12:14 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 22 Mar 2016 16:14:27 +0000 (12:14 -0400)

Trivial merge