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

2026-09-16 18:15:52 +00:00 · 2005-12-19 16:43:36 -08:00 · 2005-12-19 16:43:36 -08:00 · ce7fa1b3f9
commit ce7fa1b3f9
parent d898d485e7 9bffc4ace1
12 changed files with 52 additions and 33 deletions
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c