Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Mon, 16 Jul 2018 13:13:45 +0000 (09:13 -0400)
committerTom Rini <[email protected]>
Mon, 16 Jul 2018 13:13:45 +0000 (09:13 -0400)

Trivial merge