| commit | 6b038c8d2b99b552f0b025c8a134f8a3c417a3e7 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Tue Jan 06 11:06:46 2015 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Tue Jan 06 11:06:46 2015 +0000 |
| tree | 8a2d2b9a0de682a2e9ffe7a265b056fc57492e96 | |
| parent | 3110628d89f80fbafa085fd62e75afcb39fb764c [diff] | |
| parent | 6d40530e4789b3e2f14d61ca57ab02bd5395d5c9 [diff] |
Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof Conflicts: drivers/spi/spi-sh-msiof.c