diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-24 11:10:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-24 11:10:46 +0100 |
| commit | 5a1b11cbccda7680b6859a4648f7af16f30e79b4 (patch) | |
| tree | 2ba1fee09e15a9be1f2e01c9fdc6aa547da00224 /drivers/spi/spi-fsl-cpm.c | |
| parent | 334c40b17f0cc3de114197fa2cd75f89e3387d22 (diff) | |
| parent | 8844d0f1cb921f70ca09f6b54feeba0b90db072c (diff) | |
| parent | 145367baa492246cc19d7e859db642e6fed6908e (diff) | |
| parent | 7d0ec8b6f40b356f780b79de63eeafd6b907d68c (diff) | |
| parent | 575bec53181526ed01c0936ec008e1b70f8f5f31 (diff) | |
| parent | c5a06e75f38376238db6a38240bac4b27dfe5216 (diff) | |
Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm2835-code', 'spi/fix/bitbang', 'spi/fix/fsl-cpm' and 'spi/fix/omap2-mcspi' into spi-linus