Merge git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Sun, 22 Feb 2015 03:01:09 +0000 (22:01 -0500)
committerTom Rini <trini@ti.com>
Sun, 22 Feb 2015 03:01:09 +0000 (22:01 -0500)

Trivial merge