David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07: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	net: xfrm: xfrm_algo: Remove unused function	2015-01-12 16:50:46 -05:00
xfrm_hash.c	net: allow GFP_HIGHMEM in __vmalloc()	2010-11-21 10:04:04 -08:00
xfrm_hash.h	xfrm: hash prefixed policies based on preflen thresholds	2014-09-02 13:29:44 +02:00
xfrm_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
xfrm_ipcomp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
xfrm_output.c	net: make skb_dst_pop routine static	2015-05-12 23:19:49 -04:00
xfrm_policy.c	xfrm: optimise to search the inexact policy list	2015-05-18 10:31:56 +02:00
xfrm_proc.c	net: clean up snmp stats code	2014-05-07 16:06:05 -04:00
xfrm_replay.c	xfrm: Always zero high-order sequence number bits	2015-05-21 06:56:23 +02:00
xfrm_state.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host	2015-03-03 10:10:16 +01:00