David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c		2011-06-20 22:29:08 -07:00
..
netfilter	netfilter: Fix several warnings in compat_mtw_from_user().	2011-05-26 19:09:07 +02:00
br_device.c	netpoll: copy dev name of slaves to struct netpoll	2011-06-19 16:13:01 -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
br_if.c	net: remove synchronize_net() from netdev_set_master()	2011-05-22 21:01:20 -04: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	IGMP snooping: set mrouters_only flag for IPv6 traffic properly	2011-06-16 23:14:13 -04:00
br_netfilter.c	bridge: provide a cow_metrics method for fake_ops	2011-06-07 00:51:35 -07:00
br_netlink.c	rtnetlink: Compute and store minimum ifinfo dump size	2011-06-09 20:38:07 -07:00
br_notify.c	bridge: convert br_features_recompute() to ndo_fix_features	2011-04-28 13:33:08 -07:00
br_private_stp.h	bridge: range check STP parameters	2011-04-04 17:22:29 -07:00
br_private.h	bridge: convert br_features_recompute() to ndo_fix_features	2011-04-28 13:33:08 -07:00
br_stp_bpdu.c
br_stp_if.c	bridge: range check STP parameters	2011-04-04 17:22:29 -07:00
br_stp_timer.c
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
Makefile