Merge http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:13:24 +0000 (14:13 -0400)
committerTom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:13:24 +0000 (14:13 -0400)

Trivial merge