Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Thu, 13 Oct 2016 17:38:49 +0000 (13:38 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 13 Oct 2016 17:38:49 +0000 (13:38 -0400)

Trivial merge