Merge branch 'master' of git://git.denx.de/u-boot-nds32
authorTom Rini <trini@konsulko.com>
Sat, 1 Oct 2016 01:59:11 +0000 (21:59 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 1 Oct 2016 01:59:11 +0000 (21:59 -0400)

Trivial merge