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

Conflicts:

	net/mac80211/mlme.c

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

..

netfilter

…

br_device.c

netns bridge: allow bridges in netns!

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

br_fdb.c

…

br_forward.c

…

br_if.c

netns bridge: cleanup bridges during netns stop

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

…

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

…

br_stp_timer.c

…

br_stp.c

bridge: Eliminate unnecessary forward delay

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

br_sysfs_br.c

bridge: don't allow setting hello time to zero

2008-09-08 13:46:54 -07:00

br_sysfs_if.c

…

br.c

netns bridge: cleanup bridges during netns stop

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

Kconfig

…

Makefile

…