Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorTom Rini <trini@ti.com>
Mon, 19 Nov 2012 16:27:18 +0000 (09:27 -0700)
committerTom Rini <trini@ti.com>
Mon, 19 Nov 2012 16:27:18 +0000 (09:27 -0700)

Trivial merge