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

This commit is contained in:
Mark Brown 2013-06-04 18:52:04 +01:00
commit df91ed6d46