diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-06 18:20:37 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-06 18:20:37 +0100 |
commit | 9b1f189e6dfb0483b715e19364c782d2ddee96a0 (patch) | |
tree | e51e18c040dd4257c34b09b47c72e5eb9ef2e685 | |
parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
parent | 92dc20d83adec565378254c0630e839ff5674e14 (diff) | |
parent | 8070954d7c9fffa527e785292e901867338f79a9 (diff) | |
parent | 66ec246eb9982e7eb8e15e1fc55f543230310dd0 (diff) | |
parent | 1ff7760ff66b98ef244bf0e5e2bd5310651205ad (diff) |
Merge remote-tracking branches 'spi/fix/fsl-dspi', 'spi/fix/omap2-mcspi', 'spi/fix/pxa2xx' and 'spi/fix/ti-qspi' into spi-linus