Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorTom Rini <trini@ti.com>
Mon, 14 Jan 2013 22:30:31 +0000 (15:30 -0700)
committerTom Rini <trini@ti.com>
Mon, 14 Jan 2013 22:30:31 +0000 (15:30 -0700)

Trivial merge