Merge branch 'master' of git://www.denx.de/git/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Sun, 20 Dec 2015 03:05:31 +0000 (22:05 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 20 Dec 2015 03:05:31 +0000 (22:05 -0500)

Trivial merge