Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Wed, 31 Oct 2018 21:15:55 +0000 (17:15 -0400)
committerTom Rini <[email protected]>
Wed, 31 Oct 2018 21:15:55 +0000 (17:15 -0400)

Trivial merge