Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorTom Rini <trini@ti.com>
Sun, 31 Mar 2013 12:43:12 +0000 (08:43 -0400)
committerTom Rini <trini@ti.com>
Sun, 31 Mar 2013 12:43:12 +0000 (08:43 -0400)

Trivial merge