Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Thu, 5 Jan 2017 00:41:23 +0000 (19:41 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 5 Jan 2017 00:41:23 +0000 (19:41 -0500)

Trivial merge