diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-06 12:06:46 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-06 12:06:46 +0100 |
commit | 6b038c8d2b99b552f0b025c8a134f8a3c417a3e7 (patch) | |
tree | 8a2d2b9a0de682a2e9ffe7a265b056fc57492e96 /drivers/md/dm-thin.c | |
parent | spi: sh-msiof: Configure MSIOF sync signal timing in device tree (diff) | |
parent | spi: sh-msiof: fix MDR1_FLD_MASK value (diff) | |
download | linux-6b038c8d2b99b552f0b025c8a134f8a3c417a3e7.tar.xz linux-6b038c8d2b99b552f0b025c8a134f8a3c417a3e7.zip |
Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
Conflicts:
drivers/spi/spi-sh-msiof.c
Diffstat (limited to 'drivers/md/dm-thin.c')
0 files changed, 0 insertions, 0 deletions