David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
Kconfig	net/xfrm: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:03 -08:00
Makefile
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	xfrm: choose protocol family by skb protocol	2013-08-19 09:39:04 +02:00
xfrm_policy.c	net: clean up snmp stats code	2014-05-07 16:06:05 -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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2014-03-18 14:09:07 -04:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00