David S. Miller 230f9bb701 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/usb/cdc_ether.c All CDC ethernet devices of type USB_CLASS_COMM need to use '&mbm_info'. Signed-off-by: David S. Miller <davem@davemloft.net>		2009-11-06 00:55:55 -08:00
..
netfilter	netfilter: ebt_ulog: fix checkentry return value	2009-09-01 14:34:01 +02:00
br_device.c	bridge: Allow enable/disable UFO on bridge device via ethtool	2009-10-07 22:00:24 -07:00
br_fdb.c	bridge: Simplify interface for ATM LANE	2009-06-11 21:03:21 -07:00
br_forward.c	net/bridge: Add 'hairpin' port forwarding mode	2009-08-13 16:26:11 -07:00
br_if.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-06 00:55:55 -08:00
br_input.c	bridge: relay bridge multicast pkgs if !STP	2009-05-17 21:12:54 -07:00
br_ioctl.c	bridge: remove dev_put() in add_del_if()	2009-11-05 22:34:16 -08:00
br_netfilter.c	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
br_netlink.c	netlink: change nlmsg_notify() return value logic	2009-02-24 23:18:28 -08:00
br_notify.c	netns bridge: allow bridges in netns!	2008-09-08 16:19:58 -07:00
br_private_stp.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
br_private.h	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
br_stp_bpdu.c	netns bridge: allow bridges in netns!	2008-09-08 16:19:58 -07:00
br_stp_if.c	bridge: make bridge address settings sticky	2008-06-17 16:10:06 -07:00
br_stp_timer.c	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
br_stp.c	net: mark read-only arrays as const	2009-08-05 10:42:58 -07:00
br_sysfs_br.c	net: Fix bridgeing sysfs handling of rtnl_lock	2009-05-18 22:15:59 -07:00
br_sysfs_if.c	net/bridge: Add 'hairpin' port forwarding mode	2009-08-13 16:26:11 -07:00
br.c	bridge: Use rcu_barrier() instead of syncronize_net() on unload.	2009-06-26 13:51:32 -07:00
Kconfig	bridge: Use STP demux	2008-07-05 21:25:56 -07:00
Makefile