Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Wed, 30 Sep 2015 22:51:51 +0000 (18:51 -0400)
committerTom Rini <[email protected]>
Wed, 30 Sep 2015 22:51:51 +0000 (18:51 -0400)

Trivial merge