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

Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c

2010-04-11 14:53:53 -07:00

..

arp_tables.c

netfilter: xtables: restore indentation

2010-02-26 17:53:31 +01:00

arpt_mangle.c

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

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

arptable_filter.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

ip_queue.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

ip_tables.c

netfilter: xtables: restore indentation

2010-02-26 17:53:31 +01:00

ipt_addrtype.c

netfilter: netns-aware ipt_addrtype

2008-11-04 14:21:48 +01:00

ipt_ah.c

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

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

ipt_CLUSTERIP.c

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

2010-04-11 14:53:53 -07:00

ipt_ecn.c

netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line

2009-11-23 23:17:06 +01:00

ipt_ECN.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-12-09 19:43:33 -08:00

ipt_LOG.c

netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line

2009-11-23 23:17:06 +01:00

ipt_MASQUERADE.c

netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line

2009-11-23 23:17:06 +01:00

ipt_NETMAP.c

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

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

ipt_REDIRECT.c

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

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

ipt_REJECT.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

ipt_ULOG.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

iptable_filter.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

iptable_mangle.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

iptable_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

iptable_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: Kconfig spelling fixes (trivial)

2009-03-16 15:17:23 +01:00

Makefile

netfilter: Combine ipt_ttl and ip6t_hl source

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

nf_conntrack_l3proto_ipv4_compat.c

netfilter: nf_conntrack: fix hash resizing with namespaces

2010-02-08 11:18:07 -08:00

nf_conntrack_l3proto_ipv4.c

netfilter: nf_conntrack: add support for "conntrack zones"

2010-02-15 18:13:33 +01:00

nf_conntrack_proto_icmp.c

netfilter: nf_conntrack: add support for "conntrack zones"

2010-02-15 18:13:33 +01:00

nf_defrag_ipv4.c

netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=n

2010-02-18 19:04:44 +01:00

nf_nat_amanda.c

[NETFILTER]: remove unneeded rcu_dereference() calls

2007-11-07 04:08:23 -08:00

nf_nat_core.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

nf_nat_ftp.c

netfilter: nf_nat_ftp: remove (*mangle[]) array and functions, use %pI4

2010-01-11 11:49:51 +01:00

nf_nat_h323.c

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

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

nf_nat_helper.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

nf_nat_irc.c

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

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

nf_nat_pptp.c

netfilter: nf_conntrack: add support for "conntrack zones"

2010-02-15 18:13:33 +01:00

nf_nat_proto_common.c

nf_nat: use secure_ipv4_port_ephemeral() for NAT port randomization

2008-08-18 21:32:32 -07:00

nf_nat_proto_dccp.c

[NETFILTER]: nf_conntrack: const annotations in nf_conntrack_sctp, nf_nat_proto_gre

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

nf_nat_proto_gre.c

[NETFILTER]: nf_conntrack: const annotations in nf_conntrack_sctp, nf_nat_proto_gre

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

nf_nat_proto_icmp.c

[NETFILTER]: nf_nat: use bool type in nf_nat_proto

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

nf_nat_proto_sctp.c

netfilter: Fix extra semi-colon in skb_walk_frags() changes.

2009-06-09 18:05:28 -07:00

nf_nat_proto_tcp.c

[NETFILTER]: nf_nat: use bool type in nf_nat_proto

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

nf_nat_proto_udp.c

[NETFILTER]: nf_nat: use bool type in nf_nat_proto

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

nf_nat_proto_udplite.c

[NETFILTER]: nf_nat: use bool type in nf_nat_proto

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

nf_nat_proto_unknown.c

[NETFILTER]: nf_nat: use bool type in nf_nat_proto

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

nf_nat_rule.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

nf_nat_sip.c

netfilter: nf_nat_sip: add TCP support

2010-02-11 12:29:38 +01:00

nf_nat_snmp_basic.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

nf_nat_standalone.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

nf_nat_tftp.c

[NETFILTER]: nf_{conntrack,nat}_tftp: annotate TFTP helper with const

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