Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Mon, 11 Jul 2016 22:50:29 +0000 (18:50 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 11 Jul 2016 22:50:29 +0000 (18:50 -0400)

Trivial merge