Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sun, 15 Jan 2017 18:33:16 +0000 (13:33 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 15 Jan 2017 18:33:16 +0000 (13:33 -0500)

Trivial merge