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

2008-11-28 02:19:15 -08:00

..

ip6_queue.c

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

ip6_tables.c

netfilter: xtables: provide invoked family value to extensions

2008-10-08 11:35:20 +02:00

ip6t_ah.c

netfilter: xtables: move extension arguments into compound structure (2/6)

2008-10-08 11:35:18 +02:00

ip6t_eui64.c

netfilter: xtables: move extension arguments into compound structure (1/6)

2008-10-08 11:35:18 +02:00

ip6t_frag.c

netfilter: xtables: move extension arguments into compound structure (2/6)

2008-10-08 11:35:18 +02:00

ip6t_hbh.c

netfilter: xtables: move extension arguments into compound structure (2/6)

2008-10-08 11:35:18 +02:00

ip6t_hl.c

netfilter: xtables: move extension arguments into compound structure (1/6)

2008-10-08 11:35:18 +02:00

ip6t_HL.c

netfilter: xtables: move extension arguments into compound structure (5/6)

2008-10-08 11:35:19 +02:00

ip6t_ipv6header.c

netfilter: xtables: move extension arguments into compound structure (2/6)

2008-10-08 11:35:18 +02:00

ip6t_LOG.c

net: replace NIPQUAD() in net/ipv4/ net/ipv6/

2008-10-31 00:53:57 -07:00

ip6t_mh.c

netfilter: xtables: move extension arguments into compound structure (2/6)

2008-10-08 11:35:18 +02:00

ip6t_REJECT.c

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

ip6t_rt.c

netfilter: xtables: move extension arguments into compound structure (2/6)

2008-10-08 11:35:18 +02:00

ip6table_filter.c

netfilter: ip6table_filter: merge LOCAL_IN and FORWARD hooks

2008-11-20 09:58:08 +01:00

ip6table_mangle.c

netfilter: netns: ip6table_mangle in netns for real

2008-10-08 11:35:02 +02:00

ip6table_raw.c

netfilter: netns: ip6table_raw in netns for real

2008-10-08 11:35:01 +02:00

ip6table_security.c

netfilter: netns: remove nf_*_net() wrappers

2008-10-08 11:35:01 +02:00

Kconfig

netfilter: xtables: use "if" blocks in Kconfig

2008-10-08 11:35:18 +02:00

Makefile

netfilter: ip6_tables: add ip6tables security table

2008-06-09 15:58:05 -07:00

nf_conntrack_l3proto_ipv6.c

net: replace %p6 with %pI6

2008-10-29 12:52:50 -07:00

nf_conntrack_proto_icmpv6.c

net: '&' redux

2008-11-03 18:21:05 -08:00

nf_conntrack_reasm.c

net: '&' redux

2008-11-03 18:21:05 -08:00