Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 13:07:00 +0000 (13:07 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 13:07:00 +0000 (13:07 +0000)
1  2 
drivers/spi/spi.c

Simple merge