Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <[email protected]>
Mon, 30 Nov 2015 12:26:46 +0000 (12:26 +0000)
committerMark Brown <[email protected]>
Mon, 30 Nov 2015 12:26:46 +0000 (12:26 +0000)

Trivial merge