David S. Miller ed77a89c30 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 ...

Conflicts:

	net/netfilter/nf_conntrack_netlink.c

2008-11-28 02:19:15 -08:00

..

netfilter

netfilter: netns ebtables: ebtable_nat in netns

2008-11-04 14:30:46 +01:00

br_device.c

netdev: add more functions to netdevice ops

2008-11-20 20:14:53 -08: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

netdev: add more functions to netdevice ops

2008-11-20 20:14:53 -08:00

br_input.c

…

br_ioctl.c

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

2008-09-08 16:59:05 -07:00

br_netfilter.c

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

2008-11-28 02:19:15 -08:00

br_netlink.c

netns bridge: allow bridges in netns!

2008-09-08 16:19:58 -07:00

br_notify.c

netns bridge: allow bridges in netns!

2008-09-08 16:19:58 -07:00

br_private_stp.h

…

br_private.h

netns bridge: cleanup bridges during netns stop

2008-09-08 16:20:18 -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

…

br_stp.c

bridge: Eliminate unnecessary forward delay

2008-08-05 18:42:51 -07:00

br_sysfs_br.c

netdevice: safe convert to netdev_priv() #part-4

2008-11-12 23:39:10 -08:00

br_sysfs_if.c

…

br.c

netns bridge: cleanup bridges during netns stop

2008-09-08 16:20:18 -07:00

Kconfig

bridge: Use STP demux

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

Makefile

…