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 | 99305bdc7c84e61635e542f3cd81f29d1964ea5a (patch) | |
| tree | f32b9f08a47f2d5b601f4130e3fbcd75b339e4fd /net/ipv4/ip_tunnel.c | |
| parent | c1b0789271b13dd7561f78370122c3183cd74ab0 (diff) | |
| parent | 295070e9aa015abb9b92cccfbb1e43954e938133 (diff) | |
| parent | d8ca5bd158f738c4fa6974ee388c381f64db7905 (diff) | |
Merge remote-tracking branches 'regulator/fix/stw481x' and 'regulator/fix/tps65086' into regulator-linus