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

Trivial merge