Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Wed, 24 Feb 2016 19:25:54 +0000 (14:25 -0500)
committerTom Rini <[email protected]>
Wed, 24 Feb 2016 23:44:15 +0000 (18:44 -0500)

Trivial merge