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

This commit is contained in:
Mark Brown 2014-08-04 17:20:53 +01:00
commit 9afabfe3f8