Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Sun, 16 Sep 2018 14:30:16 +0000 (10:30 -0400)
committerTom Rini <[email protected]>
Sun, 16 Sep 2018 14:30:16 +0000 (10:30 -0400)

Trivial merge