Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 4 May 2015 21:50:20 +0000 (17:50 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 4 May 2015 21:50:20 +0000 (17:50 -0400)

Trivial merge