Patrick McHardy f9181f4ffc Merge branch 'master' of /repos/git/net-next-2.6 ...

Conflicts:
	include/net/netfilter/xt_rateest.h
	net/bridge/br_netfilter.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

2010-06-15 17:31:06 +02:00

..

ip6_queue.c

netfilter: ip6_queue: rwlock to spinlock conversion

2010-06-09 16:25:08 +02:00

ip6_tables.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-06-15 17:31:06 +02:00

ip6t_ah.c

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11 18:35:27 +02:00

ip6t_eui64.c

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11 18:35:27 +02:00

ip6t_frag.c

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11 18:35:27 +02:00

ip6t_hbh.c

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11 18:35:27 +02:00

ip6t_ipv6header.c

netfilter: xtables: deconstify struct xt_action_param for matches

2010-05-11 18:33:37 +02:00

ip6t_LOG.c

netfilter: xtables: substitute temporary defines by final name

2010-05-11 18:31:17 +02:00

ip6t_mh.c

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11 18:35:27 +02:00

ip6t_REJECT.c

netfilter: xtables: substitute temporary defines by final name

2010-05-11 18:31:17 +02:00

ip6t_rt.c

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11 18:35:27 +02:00

ip6table_filter.c

netfilter: cleanup printk messages

2010-05-13 15:02:08 +02:00

ip6table_mangle.c

netfilter: cleanup printk messages

2010-05-13 15:02:08 +02:00

ip6table_raw.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip6table_security.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kconfig

netfilter: trivial Kconfig spelling fixes

2009-03-24 13:35:27 -07:00

Makefile

netfilter: Combine ipt_ttl and ip6t_hl source

2009-02-18 18:39:31 +01:00

nf_conntrack_l3proto_ipv6.c

netfilter: cleanup printk messages

2010-05-13 15:02:08 +02:00

nf_conntrack_proto_icmpv6.c

netfilter: nf_conntrack: IPS_UNTRACKED bit

2010-06-08 16:09:52 +02:00

nf_conntrack_reasm.c

netfilter: defrag: kill unused work parameter of frag_kfree_skb()

2010-06-14 16:30:47 +02:00