Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Thu, 7 Dec 2017 22:56:51 +0000 (17:56 -0500)
committerTom Rini <[email protected]>
Thu, 7 Dec 2017 22:56:51 +0000 (17:56 -0500)

Trivial merge