Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <broonie@kernel.org>
Wed, 16 Dec 2015 13:28:31 +0000 (13:28 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 16 Dec 2015 13:28:31 +0000 (13:28 +0000)
1  2 
drivers/spi/spi.c

Simple merge