Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 23 Dec 2016 23:41:56 +0000 (18:41 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 23 Dec 2016 23:41:56 +0000 (18:41 -0500)

Trivial merge