Merge git://www.denx.de/git/u-boot-sunxi
authorTom Rini <trini@ti.com>
Wed, 5 Nov 2014 12:23:32 +0000 (07:23 -0500)
committerTom Rini <trini@ti.com>
Wed, 5 Nov 2014 12:23:32 +0000 (07:23 -0500)

Trivial merge