Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@ti.com>
Mon, 20 Oct 2014 22:17:26 +0000 (18:17 -0400)
committerTom Rini <trini@ti.com>
Mon, 20 Oct 2014 22:17:26 +0000 (18:17 -0400)

Trivial merge