Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Tue, 22 Nov 2016 12:57:23 +0000 (07:57 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 22 Nov 2016 12:57:23 +0000 (07:57 -0500)

Trivial merge