diff options
author | David S. Miller <davem@davemloft.net> | 2016-10-28 19:26:27 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-28 19:26:27 +0200 |
commit | 1d0057883626a004365537dff741b31eaf9e27a4 (patch) | |
tree | 46bf045c3fcc79e358d566c4dbb366df2caf1ada /net/socket.c | |
parent | net: skip genenerating uevents for network namespaces that are exiting (diff) | |
parent | xfrm: remove unused helper (diff) | |
download | linux-1d0057883626a004365537dff741b31eaf9e27a4.tar.xz linux-1d0057883626a004365537dff741b31eaf9e27a4.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2016-10-25
Just a leftover from the last development cycle.
1) Remove some unused code, from Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions