Merge remote-tracking branches 'spi/fix/img-spfi' and 'spi/fix/msiof' into spi-linus
authorMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:57:54 +0000 (12:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:57:54 +0000 (12:57 +0000)
1  2 
drivers/spi/spi-sh-msiof.c

Simple merge