diff options
author | Mark Brown <broonie@linaro.org> | 2014-02-23 07:22:18 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-23 07:22:18 +0400 |
commit | bcad2ca37296ab6c09de7975e850cb8f90c44c08 (patch) | |
tree | cf0ed13f902cab922e9ecd539c7591b8ba593b6b /net/batman-adv/translation-table.c | |
parent | f29d778fa47aacb4b0e7dede603756ac782c9391 (diff) | |
parent | ebf6dad0de89677aa58a4d8b009014ff88a23452 (diff) | |
parent | 08221fc4e7aa585a59de90c0354da3e8d3e88d94 (diff) | |
parent | b7db01f3b3b86f6b02a98756a051d176610ca0f1 (diff) | |
download | linux-bcad2ca37296ab6c09de7975e850cb8f90c44c08.tar.xz |
Merge remote-tracking branches 'regulator/fix/da9063', 'regulator/fix/max14577' and 'regulator/fix/s5m8767' into regulator-linus