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

..

Kbuild

netfilter: xtables: idletimer target implementation

2010-06-15 15:04:00 +02:00

nf_conntrack_amanda.h

…

nf_conntrack_common.h

netfilter: nf_conntrack: IPS_UNTRACKED bit

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

nf_conntrack_dccp.h

…

nf_conntrack_ftp.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

nf_conntrack_h323_asn1.h

…

nf_conntrack_h323_types.h

…

nf_conntrack_h323.h

…

nf_conntrack_irc.h

…

nf_conntrack_pptp.h

…

nf_conntrack_proto_gre.h

…

nf_conntrack_sane.h

…

nf_conntrack_sctp.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

nf_conntrack_sip.h

netfilter: nf_conntrack_sip: add T.38 FAX support

2010-02-11 12:30:21 +01:00

nf_conntrack_tcp.h

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

2009-12-03 13:23:12 -08:00

nf_conntrack_tftp.h

…

nf_conntrack_tuple_common.h

netfilter: include/linux/netfilter/nf_conntrack_tuple_common.h: Checkpatch cleanup

2010-03-08 13:13:07 +01:00

nfnetlink_compat.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

nfnetlink_conntrack.h

netfilter: ctnetlink: add zone support

2010-02-15 18:14:57 +01:00

nfnetlink_log.h

netfilter: nfnetlink_log: RCU conversion, part 2

2010-06-14 16:15:23 +02:00

nfnetlink_queue.h

…

nfnetlink.h

netfilter: ctnetlink: fix reliable event delivery if message building fails

2010-03-20 14:29:03 -07:00

x_tables.h

netfilter: xtables: stackptr should be percpu

2010-05-31 16:41:35 +02:00

xt_CLASSIFY.h

…

xt_cluster.h

…

xt_comment.h

…

xt_connbytes.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

xt_connlimit.h

…

xt_connmark.h

netfilter: xtables: merge xt_CONNMARK into xt_connmark

2010-03-17 15:48:36 +01:00

xt_CONNMARK.h

netfilter: xtables: merge xt_CONNMARK into xt_connmark

2010-03-17 15:48:36 +01:00

xt_CONNSECMARK.h

…

xt_conntrack.h

…

xt_CT.h

netfilter: nf_conntrack: add support for "conntrack zones"

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

xt_dccp.h

…

xt_dscp.h

…

xt_DSCP.h

…

xt_esp.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

xt_hashlimit.h

…

xt_helper.h

…

xt_IDLETIMER.h

netfilter: xtables: idletimer target implementation

2010-06-15 15:04:00 +02:00

xt_iprange.h

…

xt_LED.h

…

xt_length.h

…

xt_limit.h

…

xt_mac.h

…

xt_mark.h

netfilter: xtables: merge xt_MARK into xt_mark

2010-03-17 15:48:36 +01:00

xt_MARK.h

netfilter: xtables: merge xt_MARK into xt_mark

2010-03-17 15:48:36 +01:00

xt_multiport.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

xt_NFLOG.h

…

xt_NFQUEUE.h

…

xt_osf.h

…

xt_owner.h

…

xt_physdev.h

…

xt_pkttype.h

…

xt_policy.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

xt_quota.h

…

xt_rateest.h

…

xt_RATEEST.h

…

xt_realm.h

…

xt_recent.h

netfilter: xt_recent: check for unsupported user space flags

2010-03-17 16:18:56 +01:00

xt_sctp.h

…

xt_SECMARK.h

…

xt_socket.h

…

xt_state.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

xt_statistic.h

…

xt_string.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

xt_tcpmss.h

…

xt_TCPMSS.h

…

xt_TCPOPTSTRIP.h

…

xt_tcpudp.h

net: cleanup include/linux

2009-11-04 09:50:58 -08:00

xt_TEE.h

netfilter: xt_TEE: resolve oif using netdevice notifiers

2010-04-20 15:07:32 +02:00

xt_time.h

…

xt_TPROXY.h

…

xt_u32.h

…