Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Tue, 6 Jan 2015 15:48:32 +0000 (10:48 -0500)
committerTom Rini <trini@ti.com>
Tue, 6 Jan 2015 15:48:32 +0000 (10:48 -0500)

Trivial merge