Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 6 Jul 2015 01:22:22 +0000 (21:22 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 6 Jul 2015 01:22:22 +0000 (21:22 -0400)

Trivial merge