Merge branch 'master' of git://git.denx.de/u-boot-sparc
authorTom Rini <trini@ti.com>
Fri, 9 May 2014 15:09:59 +0000 (11:09 -0400)
committerTom Rini <trini@ti.com>
Fri, 9 May 2014 15:09:59 +0000 (11:09 -0400)

Trivial merge