Merge remote-tracking branch 'spi/fix/core' into spi-linus

This commit is contained in:
Mark Brown 2014-05-13 19:08:33 +01:00
commit 6c7bdf2d9c