Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorTom Rini <trini@ti.com>
Tue, 4 Nov 2014 15:46:45 +0000 (10:46 -0500)
committerTom Rini <trini@ti.com>
Tue, 4 Nov 2014 15:46:45 +0000 (10:46 -0500)

Trivial merge