Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 11 Dec 2015 14:06:51 +0000 (09:06 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 11 Dec 2015 14:06:51 +0000 (09:06 -0500)

Trivial merge