Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
authorMark Brown <broonie@kernel.org>
Tue, 6 Jan 2015 11:06:46 +0000 (11:06 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 6 Jan 2015 11:06:46 +0000 (11:06 +0000)
Conflicts:
drivers/spi/spi-sh-msiof.c

1  2 
drivers/spi/spi-sh-msiof.c

Simple merge