Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:05:20 +0000 (09:05 -0400)
committerTom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:05:20 +0000 (09:05 -0400)

Trivial merge