Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@ti.com>
Wed, 10 Sep 2014 00:01:59 +0000 (20:01 -0400)
committerTom Rini <trini@ti.com>
Wed, 10 Sep 2014 00:01:59 +0000 (20:01 -0400)

Trivial merge