diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-06 11:06:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-06 11:06:46 +0000 |
| commit | 6b038c8d2b99b552f0b025c8a134f8a3c417a3e7 (patch) | |
| tree | 8a2d2b9a0de682a2e9ffe7a265b056fc57492e96 /lib/mpi/mpiutil.c | |
| parent | 3110628d89f80fbafa085fd62e75afcb39fb764c (diff) | |
| parent | 6d40530e4789b3e2f14d61ca57ab02bd5395d5c9 (diff) | |
Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
Conflicts:
drivers/spi/spi-sh-msiof.c
Diffstat (limited to 'lib/mpi/mpiutil.c')
0 files changed, 0 insertions, 0 deletions