Merge remote-tracking branches 'spi/topic/falcon', 'spi/topic/fsf', 'spi/topic/fsl...
authorMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:46 +0000 (11:16 +0800)
committerMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:46 +0000 (11:16 +0800)
commitd6cd09bea9e4e1048d566cb2f462a9e0270e6926
treed6ddbe73223ab700fc66d0a9ce7c63ca8c8ae9c3
parentfab4b42a9a3dbe14dc1d058bfd6301d644661e20
parent7f6d62a2adc6c3a8eb7bbdceea2630634eb2d535
parent2c658e212ce7e40ace56d9441c8c5634d4d420e3
parent38455d7ac2e383d747ddee0189c7d8c078b29b09
parentceadfd8de067e37d52e2af6bb60016cb90342fe8
parent650705cf73f810c8af4e65a4042a9b6c91667544
Merge remote-tracking branches 'spi/topic/falcon', 'spi/topic/fsf', 'spi/topic/fsl', 'spi/topic/fsl-dspi' and 'spi/topic/gpio' into spi-next
drivers/spi/Kconfig
drivers/spi/spi-falcon.c
drivers/spi/spi-gpio.c
drivers/spi/spi-pxa2xx.c
drivers/spi/spi.c