Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Wed, 6 Jun 2018 11:16:43 +0000 (07:16 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 6 Jun 2018 11:16:43 +0000 (07:16 -0400)

Trivial merge