Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Fri, 9 Sep 2016 18:59:15 +0000 (14:59 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 9 Sep 2016 19:53:15 +0000 (15:53 -0400)

Trivial merge