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

This commit is contained in:
Mark Brown 2015-06-18 00:19:45 +01:00
commit 8757091bfa