Merge branch 'master' of http://git.denx.de/u-boot-sparc
authorTom Rini <trini@konsulko.com>
Fri, 4 Dec 2015 22:50:34 +0000 (17:50 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 4 Dec 2015 22:50:34 +0000 (17:50 -0500)

Trivial merge