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

…

Makefile

…

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

…

xfrm_hash.h

…

xfrm_input.c

…

xfrm_ipcomp.c

…

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

…

xfrm_user.c

xfrm: Convert xfrm_addr_cmp() to boolean xfrm_addr_equal().

2013-01-29 22:58:40 -05:00