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 06c54055be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net>		12 years ago
..
Kconfig	net/xfrm: remove depends on CONFIG_EXPERIMENTAL	12 years ago
Makefile	xfrm: make xfrm_algo.c a module	13 years ago
xfrm_algo.c	xfrm: add rfc4494 AES-CMAC-96 support	12 years ago
xfrm_hash.c	net: allow GFP_HIGHMEM in __vmalloc()	14 years ago
xfrm_hash.h	net: cleanup unsigned to unsigned int	13 years ago
xfrm_input.c	xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter	12 years ago
xfrm_ipcomp.c	net: xfrm: use __this_cpu_read per-cpu helper	12 years ago
xfrm_output.c	xfrm: choose protocol family by skb protocol	12 years ago
xfrm_policy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
xfrm_proc.c	xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter	12 years ago
xfrm_replay.c	xfrm: Fix esn sequence number diff calculation in xfrm_replay_notify_esn()	12 years ago
xfrm_state.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	12 years ago
xfrm_user.c	xfrm: force a garbage collection after deleting a policy	12 years ago