Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Sat, 23 Sep 2017 13:43:09 +0000 (09:43 -0400)
committerTom Rini <[email protected]>
Sat, 23 Sep 2017 13:43:09 +0000 (09:43 -0400)

Trivial merge