diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:46 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:46 +0800 |
commit | d6cd09bea9e4e1048d566cb2f462a9e0270e6926 (patch) | |
tree | d6ddbe73223ab700fc66d0a9ce7c63ca8c8ae9c3 /drivers/spi/spi.c | |
parent | fab4b42a9a3dbe14dc1d058bfd6301d644661e20 (diff) | |
parent | 7f6d62a2adc6c3a8eb7bbdceea2630634eb2d535 (diff) | |
parent | 2c658e212ce7e40ace56d9441c8c5634d4d420e3 (diff) | |
parent | 38455d7ac2e383d747ddee0189c7d8c078b29b09 (diff) | |
parent | ceadfd8de067e37d52e2af6bb60016cb90342fe8 (diff) | |
parent | 650705cf73f810c8af4e65a4042a9b6c91667544 (diff) |
Merge remote-tracking branches 'spi/topic/falcon', 'spi/topic/fsf', 'spi/topic/fsl', 'spi/topic/fsl-dspi' and 'spi/topic/gpio' into spi-next