Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:06:26 +0000 (11:06 -0400)
committerTom Rini <trini@ti.com>
Fri, 29 Aug 2014 15:06:26 +0000 (11:06 -0400)

Trivial merge