Merge remote-tracking branches 'spi/fix/spidev' and 'spi/fix/xtfpga' into spi-linus
authorMark Brown <broonie@kernel.org>
Tue, 22 Sep 2015 16:48:41 +0000 (09:48 -0700)
committerMark Brown <broonie@kernel.org>
Tue, 22 Sep 2015 16:48:41 +0000 (09:48 -0700)
1  2  3 
drivers/spi/spidev.c

Simple merge