diff options
| author | Mark Brown <broonie@kernel.org> | 2017-02-03 12:39:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-02-03 12:39:46 +0100 |
| commit | 206c4720092d2a24bfefc041b377e889a220ffbf (patch) | |
| tree | 2360fff83a9313d5c1d8c611cbcf7a55ecd5276d /net/batman-adv/distributed-arp-table.h | |
| parent | d0e287a401d9acf67b75180b26e2d62b7d482652 (diff) | |
| parent | 1372cef1c697d8aac0cc923f8aa2c37d790ec9ed (diff) | |
| parent | b98acbff9a05b371c5f0ca6e44a3af8ce9274379 (diff) | |
Merge remote-tracking branches 'regulator/fix/fixed' and 'regulator/fix/twl6040' into regulator-linus