Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@ti.com>
Sat, 31 Jan 2015 17:40:26 +0000 (12:40 -0500)
committerTom Rini <trini@ti.com>
Sat, 31 Jan 2015 17:40:26 +0000 (12:40 -0500)

Trivial merge