David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-03 23:32:12 -07: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	net: move pskb_put() to core code	2013-11-07 19:28:58 -05:00
xfrm_hash.c
xfrm_hash.h	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
xfrm_input.c	xfrm: Introduce xfrm_input_afinfo to access the the callbacks properly	2014-03-14 07:28:07 +01:00
xfrm_ipcomp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
xfrm_output.c	net/xfrm/xfrm_output.c: move EXPORT_SYMBOL	2014-05-13 12:44:28 +02:00
xfrm_policy.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2014-05-22 16:00:00 -04:00
xfrm_proc.c	net: clean up snmp stats code	2014-05-07 16:06:05 -04:00
xfrm_replay.c	xfrm: Fix aevent generation for each received packet	2013-09-25 07:32:48 +02:00
xfrm_state.c	xfrm: Remove useless xfrm_audit struct.	2014-04-23 08:21:04 +02:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00