diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 15:27:56 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 15:27:56 +0200 |
| commit | 0cab71e7014dc73a84e1d14d9b02e39c48241580 (patch) | |
| tree | 17b25202f70b62d43bca6bdf6ca9dc61f3daf0aa /drivers/dma/k3dma.c | |
| parent | spi: s3c64xx: Allow build on all Samsung platforms (diff) | |
| parent | spi/s3c64xx: Ensure runtime PM is enabled prior to registration (diff) | |
| download | linux-0cab71e7014dc73a84e1d14d9b02e39c48241580.tar.xz linux-0cab71e7014dc73a84e1d14d9b02e39c48241580.zip | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
Conflicts:
drivers/spi/spi-s3c64xx.c
Diffstat (limited to 'drivers/dma/k3dma.c')
0 files changed, 0 insertions, 0 deletions