diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-30 20:58:56 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-30 20:58:56 +0200 |
commit | 19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0 (patch) | |
tree | 16d625cdf57212c70b2eae5d86e3924ff3116031 /drivers/cpuidle | |
parent | spi: sh-msiof: Add DMA support (diff) | |
parent | spi: sh-hspi: Make of_device_id array const (diff) | |
download | linux-19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0.tar.xz linux-19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0.zip |
Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof
Conflicts:
drivers/spi/spi-sh-msiof.c
Diffstat (limited to 'drivers/cpuidle')
0 files changed, 0 insertions, 0 deletions