Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Mon, 2 Feb 2015 15:11:44 +0000 (10:11 -0500)
committerTom Rini <trini@ti.com>
Mon, 2 Feb 2015 15:11:44 +0000 (10:11 -0500)

Trivial merge