Merge git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Sun, 25 Mar 2018 16:01:44 +0000 (12:01 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 25 Mar 2018 16:01:44 +0000 (12:01 -0400)

Trivial merge