Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Wed, 31 Jan 2018 23:44:31 +0000 (18:44 -0500)
committerTom Rini <[email protected]>
Wed, 31 Jan 2018 23:44:31 +0000 (18:44 -0500)

Trivial merge