diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-06 13:58:46 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-06 13:58:46 +0100 |
commit | 4e72b4278dbc228e4dc453d4dfeca997e521d9af (patch) | |
tree | 1dc67ebd3d5312671b7de0215b3bb23132fc4af9 /drivers/spi | |
parent | Linux 3.18-rc3 (diff) | |
parent | spi: fsl-dspi: Fix CTAR selection (diff) | |
parent | spi: pxa2xx: toggle clocks on suspend if not disabled by runtime PM (diff) | |
download | linux-4e72b4278dbc228e4dc453d4dfeca997e521d9af.tar.xz linux-4e72b4278dbc228e4dc453d4dfeca997e521d9af.zip |
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus