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
br.c
br_device.c
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
br_if.c
br_input.c
br_ioctl.c
br_mdb.c
br_multicast.c
br_netfilter.c
br_netlink.c	bridge: remove a useless comment	2014-08-04 12:46:51 -07:00
br_private.h
br_private_stp.h
br_stp.c
br_stp_bpdu.c
br_stp_if.c
br_stp_timer.c
br_sysfs_br.c
br_sysfs_if.c
br_vlan.c	bridge: Update outdated comment on promiscuous mode	2014-08-05 16:37:10 -07:00
Kconfig
Makefile