David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/Makefile net/ipv6/sysctl_net_ipv6.c Two ipv6_table_template[] additions overlap, so the index of the ipv6_table[x] assignments needed to be adjusted. In the drivers/net/Makefile case, we've gotten rid of the garbage whereby we had to list every single USB networking driver in the top-level Makefile, there is just one "USB_NETWORKING" that guards everything. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-08-05 18:46:26 -07:00
..
netfilter	netfilter: kill remnants of ulog targets	2014-07-25 14:55:44 +02:00
br_device.c	bridge: Prepare for forwarding another bridge group addresses	2014-06-11 15:22:53 -07:00
br_fdb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
br_forward.c	bridge: use is_skb_forwardable in forward path	2014-03-31 16:04:04 -04:00
br_if.c	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
br_input.c	bridge: Prepare for forwarding another bridge group addresses	2014-06-11 15:22:53 -07:00
br_ioctl.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
br_mdb.c	bridge: rename struct bridge_mcast_query/querier	2014-06-10 23:50:46 -07:00
br_multicast.c	bridge: export knowledge about the presence of IGMP/MLD queriers	2014-07-08 16:12:53 -07:00
br_netfilter.c	vlan: rename __vlan_find_dev_deep() to __vlan_find_dev_deep_rcu()	2014-05-12 14:39:13 -04:00
br_netlink.c	bridge: remove a useless comment	2014-08-04 12:46:51 -07:00
br_private_stp.h	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
br_private.h	bridge: fdb dumping takes a filter device	2014-07-10 12:37:33 -07:00
br_stp_bpdu.c	br: fix use of ->rx_handler_data in code executed on non-rx_handler path	2013-12-06 15:41:40 -05:00
br_stp_if.c	bridge: Change local fdb entries whenever mac address of bridge device changes	2014-02-10 14:34:33 -08:00
br_stp_timer.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
br_stp.c	bridge: Clamp forward_delay when enabling STP	2013-09-12 23:32:14 -04:00
br_sysfs_br.c	bridge: Support 802.1ad vlan filtering	2014-06-11 15:22:53 -07:00
br_sysfs_if.c	bridge: Keep track of ports capable of automatic discovery.	2014-05-16 17:06:33 -04:00
br_vlan.c	bridge: Update outdated comment on promiscuous mode	2014-08-05 16:37:10 -07:00
br.c	bridge: make br_device_notifier static	2014-05-22 15:33:47 -04:00
Kconfig	bridge: Add vlan filtering infrastructure	2013-02-13 19:41:46 -05:00
Makefile	netfilter: bridge: fix Kconfig unmet dependencies	2014-05-26 00:42:30 -04:00