You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 8e8e43843b Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/usb/rndis_host.c drivers/net/wireless/b43/dma.c net/ipv6/ndisc.c		17 years ago
..
Kconfig	net: xfrm statistics depend on INET	17 years ago
Makefile	[XFRM]: Define packet dropping statistics.	17 years ago
xfrm_algo.c	[IPSEC]: Add support for aes-ctr.	17 years ago
xfrm_hash.c	[IPSEC]: kmalloc + memset conversion to kzalloc	17 years ago
xfrm_hash.h	[XFRM] STATE: Use destination address for src hash.	19 years ago
xfrm_input.c	[IPSEC]: Fix inter address family IPsec tunnel handling.	17 years ago
xfrm_output.c	[IPSEC]: Fix inter address family IPsec tunnel handling.	17 years ago
xfrm_policy.c	[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.	17 years ago
xfrm_proc.c	[XFRM]: Fix statistics.	17 years ago
xfrm_state.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	17 years ago
xfrm_user.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	17 years ago