David S. Miller 296c10639a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Conflicts: net/xfrm/xfrm_policy.c Minor merge conflict in xfrm_policy.c, consisting of overlapping changes which were trivial to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-02 02:13:48 -04:00
..
Kconfig	net/xfrm: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:03 -08:00
Makefile	xfrm: make xfrm_algo.c a module	2012-05-15 13:13:34 -04:00
xfrm_algo.c	xfrm: add rfc4494 AES-CMAC-96 support	2013-04-25 21:01:48 +08:00
xfrm_hash.c	net: allow GFP_HIGHMEM in __vmalloc()	2010-11-21 10:04:04 -08:00
xfrm_hash.h	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
xfrm_input.c	xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter	2013-06-06 06:45:55 +02:00
xfrm_ipcomp.c	xfrm: use vmalloc_node() for percpu scratches	2013-10-21 09:38:24 +02:00
xfrm_output.c	xfrm: choose protocol family by skb protocol	2013-08-19 09:39:04 +02:00
xfrm_policy.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2013-11-02 02:13:48 -04:00
xfrm_proc.c	xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter	2013-06-06 06:45:55 +02:00
xfrm_replay.c	xfrm: Fix aevent generation for each received packet	2013-09-25 07:32:48 +02:00
xfrm_state.c	xfrm: Simplify SA looking up when using wildcard source	2013-10-01 10:09:33 +02:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	xfrm: Guard IPsec anti replay window against replay bitmap	2013-09-17 12:17:10 +02:00