Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <broonie@kernel.org>
Mon, 4 Apr 2016 17:05:45 +0000 (10:05 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 4 Apr 2016 17:05:45 +0000 (10:05 -0700)

Trivial merge