David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-12-23 17:13:56 -05:00

..

Kconfig

ipsec: ipcomp - Merge IPComp implementations

2008-07-25 02:54:40 -07:00

Makefile

xfrm: Move IPsec replay detection functions to a separate file

2011-03-13 20:22:30 -07:00

xfrm_algo.c

xfrm: Fix key lengths for rfc3686(ctr(aes))

2011-07-28 18:10:48 -07:00

xfrm_hash.c

net: allow GFP_HIGHMEM in __vmalloc()

2010-11-21 10:04:04 -08:00

xfrm_hash.h

xfrm: Const'ify address args to hash helpers.

2011-02-23 23:07:42 -08:00

xfrm_input.c

xfrm: Perform a replay check after return from async codepaths

2011-09-21 15:20:57 -04:00

xfrm_ipcomp.c

net: add skb frag size accessors

2011-10-19 03:10:46 -04:00

xfrm_output.c

dst: Clone child entry in skb_dst_pop

2011-03-27 17:55:01 -07:00

xfrm_policy.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-23 17:13:56 -05:00

xfrm_proc.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

xfrm_replay.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

xfrm_state.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm_sysctl.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

xfrm_user.c

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00