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

2026-09-14 18:22:56 +00:00 · 2006-02-27 15:22:14 -08:00 · 2006-02-27 15:22:14 -08:00 · 272a5322d5
commit 272a5322d5
parent 051d3cbd96 ba13c98405
11 changed files with 109 additions and 155 deletions
--- a/include/linux/netfilter_bridge/ebt_log.h
+++ b/include/linux/netfilter_bridge/ebt_log.h
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ b/include/linux/netfilter_ipv4/ipt_LOG.h
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/include/linux/netfilter_ipv6/ip6t_LOG.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
--- a/net/core/request_sock.c
+++ b/net/core/request_sock.c
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c