Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@ti.com>
Tue, 30 Dec 2014 21:42:23 +0000 (16:42 -0500)
committerTom Rini <trini@ti.com>
Tue, 30 Dec 2014 21:42:23 +0000 (16:42 -0500)

Trivial merge