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
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
br_device.c	bridge: fix rcu dereference outside of rcu_read_lock	2012-08-15 15:09:41 -07:00
br_fdb.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
br_forward.c	netpoll: check netpoll tx status on the right device	2012-08-14 14:33:32 -07:00
br_if.c	bridge: add some comments for NETDEV_RELEASE	2012-08-14 14:33:31 -07:00
br_input.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
br_ioctl.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 13:44:25 -07:00
br_multicast.c	bridge: Fix enforcement of multicast hash_max limit	2012-07-16 22:59:30 -07:00
br_netfilter.c	net: Pass optional SKB and SK arguments to dst_ops->{update_pmtu,redirect}()	2012-07-17 03:29:28 -07:00
br_netlink.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
br_notify.c	Bridge: Always send NETDEV_CHANGEADDR up on br MAC change.	2011-08-09 21:44:44 -07:00
br_private_stp.h	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
br_private.h	netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup()	2012-08-14 14:33:30 -07:00
br_stp_bpdu.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
br_stp_if.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
br_stp_timer.c	time: jiffies_delta_to_clock_t() helper to the rescue	2012-08-09 16:17:03 -07:00
br_stp.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
br_sysfs_br.c	bridge: Add multicast_querier toggle and disable queries by default	2012-04-15 12:51:35 -04:00
br_sysfs_if.c	bridge: make port attributes const	2012-07-30 14:53:22 -07:00
br.c	net:bridge: use IS_ENABLED	2011-12-16 15:49:52 -05:00
Kconfig	net: bridge builtin vs. ipv6 modular	2011-03-10 13:45:57 -08:00
Makefile	bridge: Add core IGMP snooping support	2010-02-28 00:48:45 -08:00