Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Wed, 3 Aug 2016 00:45:24 +0000 (20:45 -0400)
committerTom Rini <[email protected]>
Wed, 3 Aug 2016 00:45:24 +0000 (20:45 -0400)

Trivial merge