Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Mon, 2 Jul 2018 18:40:03 +0000 (14:40 -0400)
committerTom Rini <[email protected]>
Mon, 2 Jul 2018 18:40:03 +0000 (14:40 -0400)

Trivial merge