diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 13:27:56 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 13:27:56 (GMT) |
| commit | 0cab71e7014dc73a84e1d14d9b02e39c48241580 (patch) | |
| tree | 17b25202f70b62d43bca6bdf6ca9dc61f3daf0aa /mm/nommu.c | |
| parent | 7d5f880b46f222ff83a76fd36b01f5a59bf32122 (diff) | |
| parent | 3e2bd64d243ff0f3dc08c49ff218fed42ee9d981 (diff) | |
| download | linux-fsl-qoriq-0cab71e7014dc73a84e1d14d9b02e39c48241580.tar.xz | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
Conflicts:
drivers/spi/spi-s3c64xx.c
Diffstat (limited to 'mm/nommu.c')
0 files changed, 0 insertions, 0 deletions