Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorTom Rini <[email protected]>
Fri, 26 Jul 2013 19:29:45 +0000 (15:29 -0400)
committerTom Rini <[email protected]>
Fri, 26 Jul 2013 19:29:45 +0000 (15:29 -0400)

Trivial merge