Merge git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Thu, 26 Apr 2018 00:50:28 +0000 (20:50 -0400)
committerTom Rini <[email protected]>
Thu, 26 Apr 2018 00:50:28 +0000 (20:50 -0400)

Trivial merge