diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-08 12:17:17 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 12:17:17 +0000 |
commit | f56be67b190a95b9e2d4d9bd30b61907cabcf443 (patch) | |
tree | fafb509fcc6298eb7c89edb83f5e99d491317794 /net/batman-adv | |
parent | dcf695b5f30e22063e85e27e77e18cc998a17fb1 (diff) | |
parent | 9e8987acf051e48fc0e228b6f38c47a75352c58b (diff) | |
parent | e5262d0568dc9e10de79a726dfd7edb712a2c10b (diff) | |
parent | dfcc2e3549b5d57886d4ce6b4762bd4b64f6f945 (diff) | |
parent | bc88f11baf5a7e6671eac6fe3131c087d71a646f (diff) | |
parent | 8509c55fcb5192b7f70ec596a8752c2ec39942e3 (diff) |
Merge remote-tracking branches 'spi/topic/mxs', 'spi/topic/pxa', 'spi/topic/rockchip', 'spi/topic/samsung' and 'spi/topic/sirf' into spi-next