Merge remote-tracking branch 'spi/topic/core' into spi-next
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:34 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:34 +0000 (17:08 +0100)
1  2 
drivers/spi/spi.c

Simple merge