Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <broonie@linaro.org>
Tue, 11 Feb 2014 12:08:26 +0000 (12:08 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 11 Feb 2014 12:08:26 +0000 (12:08 +0000)
1  2 
drivers/spi/spi.c

Simple merge