Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Fri, 5 May 2017 20:45:30 +0000 (16:45 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 5 May 2017 20:45:30 +0000 (16:45 -0400)

Trivial merge