Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Mon, 15 Aug 2016 20:38:39 +0000 (16:38 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 15 Aug 2016 20:38:39 +0000 (16:38 -0400)

Trivial merge