Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Mon, 24 Aug 2015 00:41:04 +0000 (20:41 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 24 Aug 2015 00:41:04 +0000 (20:41 -0400)

Trivial merge