Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@ti.com>
Mon, 25 Nov 2013 15:42:19 +0000 (10:42 -0500)
committerTom Rini <trini@ti.com>
Mon, 25 Nov 2013 15:42:19 +0000 (10:42 -0500)

Trivial merge