Merge git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Wed, 16 Aug 2017 22:07:15 +0000 (18:07 -0400)
committerTom Rini <[email protected]>
Wed, 16 Aug 2017 22:07:15 +0000 (18:07 -0400)

Trivial merge