Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Thu, 28 Jun 2018 13:04:41 +0000 (09:04 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 28 Jun 2018 13:04:41 +0000 (09:04 -0400)

Trivial merge