Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sun, 31 May 2015 00:15:59 +0000 (20:15 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 31 May 2015 00:15:59 +0000 (20:15 -0400)

Trivial merge