David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

2008-07-18 02:39:39 -07:00

..

netfilter

netfilter: ebt_nflog: fix Kconfig typo

2008-07-08 02:37:07 -07:00

br_device.c

bridge: make bridge address settings sticky

2008-06-17 16:10:06 -07:00

br_fdb.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18 02:39:39 -07:00

br_forward.c

net: Discard and warn about LRO'd skbs received for forwarding

2008-06-19 16:22:28 -07:00

br_if.c

bridge: Check return of dev_set_promiscuity

2008-07-14 20:53:13 -07:00

br_input.c

bridge: handle process all link-local frames

2008-06-17 16:09:45 -07:00

br_ioctl.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

br_netfilter.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14 02:30:23 -07:00

br_netlink.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

br_notify.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

br_private_stp.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

br_private.h

bridge: Use STP demux

2008-07-05 21:25:56 -07:00

br_stp_bpdu.c

bridge: Use STP demux

2008-07-05 21:25:56 -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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18 02:39:39 -07:00

br_sysfs_br.c

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

br_sysfs_if.c

Kobject: change net/bridge to use kobject_create_and_add

2008-01-24 20:40:26 -08:00

br.c

bridge: Use STP demux

2008-07-05 21:25:56 -07:00

Kconfig

bridge: Use STP demux

2008-07-05 21:25:56 -07:00

Makefile

[BRIDGE]: netlink interface for link management

2006-06-17 21:26:14 -07:00