David S. Miller 6dec4ac4ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/ipv4/inet_diag.c

2011-11-26 14:47:03 -05:00

..

ip6_queue.c

netfilter: nf_queue: reject NF_STOLEN verdicts from userspace

2011-08-30 15:01:20 +02:00

ip6_tables.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

2011-04-19 11:24:06 -07: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

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

2011-02-19 19:17:35 -08:00

ip6t_mh.c

netfilter: xtables: change hotdrop pointer to direct modification

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

ip6t_REJECT.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05: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: ip6table_mangle: Fix set-but-unused variables.

2011-04-17 17:06:15 -07: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: Remove NOTRACK/RAW dependency on NETFILTER_ADVANCED.

2011-11-23 16:07:00 -05:00

Makefile

Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:12 -08:00

nf_conntrack_l3proto_ipv6.c

netfilter: add more values to enum ip_conntrack_info

2011-06-06 01:35:10 +02:00

nf_conntrack_proto_icmpv6.c

netfilter: nf_conntrack: fix ct refcount leak in l4proto->error()

2011-06-06 01:37:02 +02:00

nf_conntrack_reasm.c

netfilter: Remove unnecessary OOM logging messages

2011-11-01 09:19:49 +01:00

nf_defrag_ipv6_hooks.c

Fix common misspellings

2011-03-31 11:26:23 -03:00