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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl4965-base.c

2008-06-28 01:19:40 -07:00

..

ip6_queue.c

netfilter: {ip,ip6,nfnetlink}_queue: misc cleanups

2008-06-09 16:00:45 -07:00

ip6_tables.c

[NETFILTER]: {ip,ip6,arp}_tables: return EAGAIN for invalid SO_GET_ENTRIES size

2008-04-14 11:15:45 +02: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]: annotate xtables targets with const and remove casts

2008-04-14 09:56:05 +02:00

ip6t_LOG.c

[NETFILTER]: {ip,ip6}t_LOG: print MARK value in log output

2008-04-14 09:56:01 +02:00

ip6t_mh.c

[NETFILTER]: Update modules' descriptions

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

ip6t_REJECT.c

[NETFILTER]: annotate xtables targets with const and remove casts

2008-04-14 09:56:05 +02:00

ip6t_rt.c

[NETFILTER]: annotate xtables targets with const and remove casts

2008-04-14 09:56:05 +02:00

ip6table_filter.c

[NETFILTER]: Use non-deprecated __RW_LOCK_UNLOCKED macro

2008-04-14 09:56:03 +02:00

ip6table_mangle.c

netfilter: ip6table_mangle: don't reroute in LOCAL_IN

2008-06-24 13:30:45 -07:00

ip6table_raw.c

[NETFILTER]: Use non-deprecated __RW_LOCK_UNLOCKED macro

2008-04-14 09:56:03 +02:00

ip6table_security.c

netfilter: ip6_tables: add ip6tables security table

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

Kconfig

netfilter: ip6_tables: add ip6tables security table

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

Makefile

netfilter: ip6_tables: add ip6tables security table

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

nf_conntrack_l3proto_ipv6.c

[NETFILTER]: nf_conntrack: use bool type in struct nf_conntrack_l3proto

2008-04-14 11:15:52 +02:00

nf_conntrack_proto_icmpv6.c

netfilter: nf_conntrack: properly account terminating packets

2008-06-09 15:59:40 -07:00

nf_conntrack_reasm.c

inet fragments: fix race between inet_frag_find and inet_frag_secret_rebuild

2008-06-27 20:06:08 -07:00