Linus Torvalds db9edfd7e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 ...

Trivial manual merge fixup for usb_find_interface clashes.

2006-01-04 18:44:12 -08:00

..

netfilter

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

br_device.c

[BRIDGE]: limited ethtool support

2006-01-03 13:11:03 -08:00

br_fdb.c

[BRIDGE]: Use ether_compare

2005-10-31 16:34:10 -02:00

br_forward.c

[BRIDGE]: TSO fix in br_dev_queue_push_xmit

2005-09-22 23:35:34 -07:00

br_if.c

[BRIDGE]: limited ethtool support

2006-01-03 13:11:03 -08:00

br_input.c

[BRIDGE]: filter packets in learning state

2006-01-03 13:11:02 -08:00

br_ioctl.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

br_netfilter.c

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

br_notify.c

[BRIDGE]: handle speed detection after carrier changes

2006-01-03 13:11:01 -08:00

br_private_stp.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

br_private.h

[BRIDGE]: add version number

2006-01-03 13:11:04 -08:00

br_stp_bpdu.c

[BRIDGE]: prevent bad forwarding table updates

2005-05-29 14:15:55 -07:00

br_stp_if.c

[BRIDGE]: Fix faulty check in br_stp_recalculate_bridge_id()

2006-01-03 14:35:54 -08:00

br_stp_timer.c

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_sysfs_br.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

br_sysfs_if.c

[PATCH] driver core: replace "hotplug" by "uevent"

2006-01-04 16:18:08 -08:00

br.c

[BRIDGE]: add version number

2006-01-03 13:11:04 -08:00

Kconfig

[NET]: move config options out to individual protocols

2005-07-11 21:13:56 -07:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00