Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Sat, 17 Oct 2015 00:21:04 +0000 (20:21 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 17 Oct 2015 00:21:04 +0000 (20:21 -0400)

Trivial merge