diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-26 11:16:27 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-26 11:16:27 +0000 |
commit | 06a5687f82bd7f1fbf56363351c47e8c337302fc (patch) | |
tree | 134e60fe78c0feca0a93119470fa3e208ab54a2b /net/ceph/mon_client.c | |
parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) | |
parent | 3dbb3b98e854bceed38fbde930fb8cf8701def73 (diff) | |
parent | 6d40530e4789b3e2f14d61ca57ab02bd5395d5c9 (diff) | |
parent | c957e8f084e0d21febcd6b8a0ea9631eccc92f36 (diff) | |
download | op-kernel-dev-06a5687f82bd7f1fbf56363351c47e8c337302fc.zip op-kernel-dev-06a5687f82bd7f1fbf56363351c47e8c337302fc.tar.gz |
Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/msiof' and 'spi/fix/pxa2xx' into spi-linus