Merge remote-tracking branch 'spi/topic/coldfire-qspi' into spi-next
authorMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 15:20:57 +0000 (16:20 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 15:20:57 +0000 (16:20 +0100)
1  2 
drivers/spi/spi-coldfire-qspi.c

Simple merge