Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Tue, 21 Apr 2015 00:16:21 +0000 (20:16 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 21 Apr 2015 00:16:21 +0000 (20:16 -0400)

Trivial merge