Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Tue, 23 Feb 2016 20:35:47 +0000 (15:35 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 23 Feb 2016 20:35:47 +0000 (15:35 -0500)

Trivial merge