Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:45 +0000 (00:19 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:45 +0000 (00:19 +0100)

Trivial merge