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
l2tp_core.c	l2tp: fix a lockdep splat	2012-09-04 14:07:50 -04:00
l2tp_core.h	l2tp: avoid to use synchronize_rcu in tunnel free function	2012-08-30 12:31:03 -04:00
l2tp_debugfs.c
l2tp_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
l2tp_ip.c
l2tp_ip6.c	l2tp: fix info leak via getsockname()	2012-08-15 21:36:31 -07:00
l2tp_netlink.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
l2tp_ppp.c
Makefile