You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		16 years ago
..
netfilter	netfilter: netns ebtables: ebtable_nat in netns	16 years ago
Kconfig	…
Makefile	…
br.c	netns bridge: cleanup bridges during netns stop	17 years ago
br_device.c	netdev: add more functions to netdevice ops	16 years ago
br_fdb.c	…
br_forward.c	…
br_if.c	netdev: add more functions to netdevice ops	16 years ago
br_input.c	…
br_ioctl.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	17 years ago
br_netfilter.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	16 years ago
br_netlink.c	netns bridge: allow bridges in netns!	17 years ago
br_notify.c	netns bridge: allow bridges in netns!	17 years ago
br_private.h	netns bridge: cleanup bridges during netns stop	17 years ago
br_private_stp.h	…
br_stp.c	…
br_stp_bpdu.c	netns bridge: allow bridges in netns!	17 years ago
br_stp_if.c	…
br_stp_timer.c	…
br_sysfs_br.c	netdevice: safe convert to netdev_priv() #part-4	16 years ago
br_sysfs_if.c	…