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
..
ebt_802_3.c
ebt_among.c
ebt_arp.c
ebt_arpreply.c
ebt_dnat.c
ebt_ip6.c	ipv6: Add fragment reporting to ipv6_skip_exthdr().	2011-12-03 09:35:10 -08:00
ebt_ip.c
ebt_limit.c
ebt_log.c	netfilter: log: Fix log-level processing	2012-09-12 17:17:35 +02:00
ebt_mark_m.c
ebt_mark.c
ebt_nflog.c
ebt_pkttype.c
ebt_redirect.c
ebt_snat.c
ebt_stp.c	bridge: netfilter: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
ebt_ulog.c	netlink: hide struct module parameter in netlink_kernel_create	2012-09-08 18:46:30 -04:00
ebt_vlan.c
ebtable_broute.c
ebtable_filter.c	netfilter: PTR_RET can be used	2012-08-14 02:31:47 +02:00
ebtable_nat.c	netfilter: PTR_RET can be used	2012-08-14 02:31:47 +02:00
ebtables.c	netfilter: bridge: fix wrong pointer dereference	2012-03-06 14:43:49 -05:00
Kconfig
Makefile