Merge branch 'net' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Tue, 4 Feb 2014 16:48:39 +0000 (11:48 -0500)
committerTom Rini <trini@ti.com>
Tue, 4 Feb 2014 16:51:20 +0000 (11:51 -0500)

Trivial merge