diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 12:17:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 12:17:19 +0000 |
| commit | c1b0789271b13dd7561f78370122c3183cd74ab0 (patch) | |
| tree | f4eda3db7bd1b059de81cd4bec7fbb871661dbe2 /net/ipv4/ipmr.c | |
| parent | 69973b830859bc6529a7a0468ba0d80ee5117826 (diff) | |
| parent | 618c808968852609d2d9f0e5cfc351a4807ef8d0 (diff) | |
Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus
Diffstat (limited to 'net/ipv4/ipmr.c')