Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Tue, 15 Dec 2015 01:27:23 +0000 (20:27 -0500)
committerTom Rini <[email protected]>
Tue, 15 Dec 2015 01:27:23 +0000 (20:27 -0500)

Trivial merge