David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
Kconfig	net/xfrm: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:03 -08:00
Makefile	xfrm: make xfrm_algo.c a module	2012-05-15 13:13:34 -04:00
xfrm_algo.c	pf_key/xfrm_algo: prepare pf_key and xfrm_algo for new algorithms without pfkey support	2013-02-01 10:13:43 +01:00
xfrm_hash.c	net: allow GFP_HIGHMEM in __vmalloc()	2010-11-21 10:04:04 -08:00
xfrm_hash.h	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xfrm_input.c	xfrm: Workaround incompatibility of ESN and async crypto	2012-09-04 14:09:45 -04:00
xfrm_ipcomp.c	net: xfrm: use __this_cpu_read per-cpu helper	2012-11-13 14:38:52 +01:00
xfrm_output.c	xfrm: fix a unbalanced lock	2013-02-01 10:33:40 +01:00
xfrm_policy.c	xfrm: use xfrm direction when lookup policy	2013-03-19 10:35:11 -04:00
xfrm_proc.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
xfrm_replay.c	xfrm: Fix esn sequence number diff calculation in xfrm_replay_notify_esn()	2013-03-25 07:25:50 +01:00
xfrm_state.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	xfrm: Convert xfrm_addr_cmp() to boolean xfrm_addr_equal().	2013-01-29 22:58:40 -05:00