Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Tue, 4 Aug 2015 16:21:45 +0000 (12:21 -0400)
committerTom Rini <[email protected]>
Tue, 4 Aug 2015 16:21:45 +0000 (12:21 -0400)

Trivial merge