Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <[email protected]>
Fri, 24 Apr 2015 10:10:45 +0000 (11:10 +0100)
committerMark Brown <[email protected]>
Fri, 24 Apr 2015 10:10:45 +0000 (11:10 +0100)

Trivial merge