Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorTom Rini <trini@ti.com>
Mon, 9 Sep 2013 13:59:30 +0000 (09:59 -0400)
committerTom Rini <trini@ti.com>
Mon, 9 Sep 2013 13:59:30 +0000 (09:59 -0400)

Trivial merge