Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <broonie@linaro.org>
Thu, 28 Nov 2013 11:31:35 +0000 (11:31 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 28 Nov 2013 11:31:35 +0000 (11:31 +0000)
1  2 
drivers/spi/spi.c

Simple merge