Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Tue, 26 Jul 2016 21:34:28 +0000 (17:34 -0400)
committerTom Rini <[email protected]>
Tue, 26 Jul 2016 21:34:28 +0000 (17:34 -0400)

Trivial merge