David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The forcedeth changes had a conflict with the conversion over to atomic u64 statistics in net-next. The libertas cfg.c code had a conflict with the bss reference counting fix by John Linville in net-next. Conflicts: drivers/net/ethernet/nvidia/forcedeth.c drivers/net/wireless/libertas/cfg.c		2011-11-21 13:50:33 -05:00
..
netfilter	netfilter: Remove unnecessary OOM logging messages	2011-11-01 09:19:49 +01:00
br.c
br_device.c	net: remove NETIF_F_NO_CSUM feature bit	2011-11-16 17:43:12 -05:00
br_fdb.c	bridge: add NTF_USE support	2011-11-14 00:41:54 -05:00
br_forward.c
br_if.c	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
br_input.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
br_ioctl.c
br_multicast.c	bridge: correct IPv6 checksum after pull	2011-11-16 17:32:43 -05:00
br_netfilter.c
br_netlink.c	bridge: fix hang on removal of bridge via netlink	2011-10-18 23:24:16 -04:00
br_notify.c
br_private.h	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
br_private_stp.h
br_stp.c
br_stp_bpdu.c
br_stp_if.c	net: fix implicit kmod.h usage in bridge/br_stp_if.c	2011-10-31 19:30:30 -04:00
br_stp_timer.c
br_sysfs_br.c	bridge: allow forwarding some link local frames	2011-10-06 15:27:56 -04:00
br_sysfs_if.c
Kconfig
Makefile