diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 (patch) | |
tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 /drivers/spi/spi-davinci.c | |
parent | spi: Use dev_get_drvdata at appropriate places (diff) | |
parent | spi: spi-rspi: fix inconsistent spin_lock_irqsave (diff) | |
download | linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.tar.xz linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.zip |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
Conflicts:
drivers/spi/spi-rspi.c
Diffstat (limited to 'drivers/spi/spi-davinci.c')
0 files changed, 0 insertions, 0 deletions