Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Wed, 14 Nov 2018 00:50:01 +0000 (19:50 -0500)
committerTom Rini <[email protected]>
Wed, 14 Nov 2018 00:50:01 +0000 (19:50 -0500)

Trivial merge