David S. Miller 47871889c6 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/firmware/iscsi_ibft.c

2010-02-28 19:23:06 -08:00

..

Kconfig

ipsec: ipcomp - Merge IPComp implementations

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

Makefile

netns xfrm: per-netns sysctls

2008-11-25 18:00:48 -08:00

xfrm_algo.c

crypto: gcm - Add RFC4543 wrapper for GCM

2010-01-17 21:52:11 +11:00

xfrm_hash.c

[IPSEC]: kmalloc + memset conversion to kzalloc

2008-01-28 14:55:05 -08:00

xfrm_hash.h

Fix xfrm hash collisions by changing __xfrm4_daddr_saddr_hash to hash addresses with addition

2009-08-09 21:45:31 -07:00

xfrm_input.c

xfrm: SA lookups signature with mark

2010-02-22 16:20:22 -08:00

xfrm_ipcomp.c

percpu: add __percpu sparse annotations to net

2010-02-16 23:05:38 -08:00

xfrm_output.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

xfrm_policy.c

xfrm: clone mark when cloning policy

2010-02-23 15:09:53 -08:00

xfrm_proc.c

xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR

2010-02-18 15:43:09 -08:00

xfrm_state.c

xfrm: SA lookups with mark

2010-02-22 16:21:07 -08:00

xfrm_sysctl.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

xfrm_user.c

xfrm: Allow user space manipulation of SPD mark

2010-02-22 16:21:26 -08:00