You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 00dad5e479 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/e1000e/hw.h net/bridge/br_device.c net/bridge/br_input.c		15 years ago
..
netfilter	bridge: use rx_handler_data pointer to store net_bridge_port pointer	15 years ago
Kconfig	…
Makefile	…
br.c	net: replace hooks in __netif_receive_skb V5	15 years ago
br_device.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
br_fdb.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
br_forward.c	bridge: Partially disable netpoll support	15 years ago
br_if.c	bridge: use rx_handler_data pointer to store net_bridge_port pointer	15 years ago
br_input.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
br_ioctl.c	…
br_multicast.c	bridge: Allow multicast snooping to be disabled before ifup	15 years ago
br_netfilter.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
br_netlink.c	bridge: use rx_handler_data pointer to store net_bridge_port pointer	15 years ago
br_notify.c	bridge: use rx_handler_data pointer to store net_bridge_port pointer	15 years ago
br_private.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	15 years ago
br_private_stp.h	…
br_stp.c	…
br_stp_bpdu.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
br_stp_if.c	…
br_stp_timer.c	…
br_sysfs_br.c	bridge: add per bridge device controls for invoking iptables	15 years ago
br_sysfs_if.c	…