David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04: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: xfrm: convert to SKB frag APIs

2011-08-24 17:52:12 -07:00

xfrm_output.c

dst: Clone child entry in skb_dst_pop

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

xfrm_policy.c

net: Add ->neigh_lookup() operation to dst_ops

2011-07-18 00:40:17 -07:00

xfrm_proc.c

xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR

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

xfrm_replay.c

xfrm: Fix off by one in the replay advance functions

2011-06-07 21:14:39 -07:00

xfrm_state.c

XFRM: Fix memory leak in xfrm_state_update

2011-07-08 08:58:42 -07: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

rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

2011-08-02 04:29:23 -07:00