Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Wed, 24 Feb 2016 19:26:28 +0000 (14:26 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 24 Feb 2016 23:44:19 +0000 (18:44 -0500)

Trivial merge