]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Oct 2016 17:26:27 +0000 (13:26 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Oct 2016 17:26:27 +0000 (13:26 -0400)
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>

Trivial merge