Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Mon, 5 Dec 2016 22:00:23 +0000 (17:00 -0500)
committerTom Rini <[email protected]>
Mon, 5 Dec 2016 22:00:23 +0000 (17:00 -0500)

Trivial merge