David S. Miller e1ec1b8ccd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/s2io.c

2008-04-02 22:35:23 -07:00

..

ip6_queue.c

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

2008-03-27 18:48:56 -07:00

ip6_tables.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

ip6t_ah.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_eui64.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_frag.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_hbh.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_hl.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_HL.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_ipv6header.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_LOG.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_mh.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6t_REJECT.c

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

ip6t_rt.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

ip6table_filter.c

[NETFILTER]: ip6_tables: per-netns IPv6 FILTER, MANGLE, RAW

2008-01-31 19:27:39 -08:00

ip6table_mangle.c

[NETFILTER]: ip6_tables: per-netns IPv6 FILTER, MANGLE, RAW

2008-01-31 19:27:39 -08:00

ip6table_raw.c

[NETFILTER]: ip6_tables: per-netns IPv6 FILTER, MANGLE, RAW

2008-01-31 19:27:39 -08:00

Kconfig

Make !NETFILTER_ADVANCED enable IP6_NF_MATCH_IPV6HEADER

2008-01-31 00:26:10 +11:00

Makefile

[NETFILTER]: merge ipt_owner/ip6t_owner in xt_owner

2008-01-28 14:55:55 -08:00

nf_conntrack_l3proto_ipv6.c

[NETFILTER]: nf_conntrack: annotate l3protos with const

2008-01-31 19:28:13 -08:00

nf_conntrack_proto_icmpv6.c

[NETFILTER]: nf_{conntrack,nat}_icmp: constify and annotate

2008-01-31 19:28:12 -08:00

nf_conntrack_reasm.c

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

2008-04-02 22:35:23 -07:00