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

2026-09-24 18:16:04 +00:00 · 2006-01-11 17:06:47 -08:00 · 2006-01-11 17:06:47 -08:00 · 45ed344cc7
commit 45ed344cc7
parent 99535ac2d4 bb7e8c5a55
24 changed files with 61 additions and 48 deletions
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
--- a/net/core/dv.c
+++ b/net/core/dv.c
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
--- a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
--- a/net/ipv6/netfilter/ip6t_mac.c
+++ b/net/ipv6/netfilter/ip6t_mac.c
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
--- a/net/irda/irias_object.c
+++ b/net/irda/irias_object.c
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
--- a/net/socket.c
+++ b/net/socket.c
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c