Merge branch 'next' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Mon, 8 May 2017 19:44:52 +0000 (15:44 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 8 May 2017 19:44:52 +0000 (15:44 -0400)

Trivial merge