Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Tue, 23 Aug 2016 11:20:36 +0000 (07:20 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 23 Aug 2016 11:20:36 +0000 (07:20 -0400)

Trivial merge