David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -04:00
..
Kconfig	xfrm: make xfrm_algo.c a module	2012-05-15 13:13:34 -04:00
Makefile	xfrm: make xfrm_algo.c a module	2012-05-15 13:13:34 -04:00
xfrm_algo.c	xfrm_algo: drop an unnecessary inclusion	2012-05-15 13:13:34 -04:00
xfrm_hash.c
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: add skb frag size accessors	2011-10-19 03:10:46 -04:00
xfrm_output.c	xfrm: Remove unused xfrm_state from xfrm_state_check_space	2012-03-22 19:29:58 -04:00
xfrm_policy.c	xfrm: fix RCU bugs	2012-08-22 22:39:46 -07:00
xfrm_proc.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
xfrm_replay.c	xfrm: Workaround incompatibility of ESN and async crypto	2012-09-04 14:09:45 -04:00
xfrm_state.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
xfrm_sysctl.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
xfrm_user.c	xfrm: Report user triggered expirations against the users socket	2012-09-10 15:34:30 -04:00