openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/net/bridge
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
 		2006-12-05 14:37:56 +00:00
..
netfilter [EBTABLES]: Split ebt_replace into user and kernel variants, annotate. 2006-12-02 21:32:05 -08:00
Kconfig [BRIDGE]: use llc for receiving STP packets 2006-03-20 22:59:06 -08:00
Makefile [BRIDGE]: netlink interface for link management 2006-06-17 21:26:14 -07:00
br.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
br_device.c [NET]: Added GSO header verification 2006-06-29 16:57:53 -07:00
br_fdb.c [BRIDGE]: flush forwarding table when device carrier off 2006-10-15 23:14:13 -07:00
br_forward.c [NETFILTER] bridge: code rearrangement for clarity 2006-09-22 15:18:30 -07:00
br_if.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
br_input.c [BRIDGE]: keep track of received multicast packets 2006-05-05 17:07:13 -07:00
br_ioctl.c [PATCH] bridge: fix possible overflow in get_fdb_entries 2006-11-28 17:26:50 -08:00
br_netfilter.c [NET]: Kill direct includes of asm/checksum.h 2006-12-02 21:22:59 -08:00
br_netlink.c [BRIDGE] netlink: Convert bridge netlink code to new netlink interface 2006-12-02 21:26:13 -08:00
br_notify.c [BRIDGE]: netlink interface for link management 2006-06-17 21:26:14 -07:00
br_private.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
br_private_stp.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
br_stp.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
br_stp_bpdu.c [BRIDGE]: random extra bytes on STP TCN packet 2006-09-17 23:21:08 -07:00
br_stp_if.c [BRIDGE]: flush forwarding table when device carrier off 2006-10-15 23:14:13 -07:00
br_stp_timer.c [BRIDGE]: use setup_timer 2006-03-20 22:56:38 -08:00
br_sysfs_br.c [BRIDGE]: correct print message typo 2006-10-25 23:07:37 -07:00
br_sysfs_if.c [BRIDGE]: fix error handling for add interface to bridge 2006-02-09 17:10:12 -08:00