linux/net/bridge
David S. Miller 2bd93d7af1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2011-04-26 12:16:46 -07:00
..
netfilter bridge: netfilter: fix information leak 2011-02-14 16:49:23 +01:00
br_device.c bridge: allow creating bridge devices with netlink 2011-04-04 17:22:28 -07:00
br_fdb.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_forward.c net: bridge: check the length of skb after nf_bridge_maybe_copy_header() 2011-01-06 11:33:05 -08:00
br_if.c bridge: allow creating bridge devices with netlink 2011-04-04 17:22:28 -07:00
br_input.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-04-26 12:16:46 -07: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 inet: constify ip headers and in6_addr 2011-04-22 11:04:14 -07:00
br_netfilter.c inet: constify ip headers and in6_addr 2011-04-22 11:04:14 -07:00
br_netlink.c bridge: allow creating bridge devices with netlink 2011-04-04 17:22:28 -07:00
br_notify.c bridge: fix accidental creation of sysfs directory 2011-04-17 17:52:51 -07:00
br_private_stp.h bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br_private.h bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br_stp_bpdu.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-01-04 11:57:25 -08:00
br_stp_if.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br_stp_timer.c bridge: control carrier based on ports online 2011-03-14 14:29:02 -07:00
br_stp.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br_sysfs_br.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br_sysfs_if.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br.c bridge: allow creating bridge devices with netlink 2011-04-04 17:22:28 -07: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