diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-07 23:56:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-07 23:56:32 -0400 |
| commit | 62515f95b45818ddd925569504fe52f4afd3eb7a (patch) | |
| tree | d12c866b158b3e36801e4039221829edad0a0b7f /net/ethernet | |
| parent | 9d4927f0d3760d8f10727c3035121d2677108f44 (diff) | |
| parent | 565f0fa902b64020d5d147ff1708567e9e0b6e49 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Minor conflict in ip_output.c, overlapping changes to
the body of an if() statement.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethernet')
0 files changed, 0 insertions, 0 deletions