Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-next
authorMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:49:11 +0000 (13:49 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:49:11 +0000 (13:49 +0100)
1  2 
drivers/spi/spi-sh-msiof.c

Simple merge