Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Thu, 7 Jan 2016 17:41:57 +0000 (12:41 -0500)
committerTom Rini <[email protected]>
Thu, 7 Jan 2016 17:41:57 +0000 (12:41 -0500)

Trivial merge