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

Conflicts:
	include/linux/if_pppox.h

Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-08-22 22:37:04 -07:00

..

Kbuild

include: replace unifdef-y with header-y

2010-08-14 22:26:51 +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

…

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

…

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

…

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

…

nfnetlink_conntrack.h

netfilter: ctnetlink: add zone support

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

nfnetlink_log.h

nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-space

2010-07-15 11:27:41 +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_CHECKSUM.h

netfilter: correct CHECKSUM header and export it

2010-07-16 14:08:20 +02:00

xt_CLASSIFY.h

…

xt_cluster.h

…

xt_comment.h

…

xt_connbytes.h

…

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_cpu.h

netfilter: add xt_cpu match

2010-07-23 12:59:36 +02:00

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

…

xt_hashlimit.h

…

xt_helper.h

…

xt_IDLETIMER.h

header: fix broken headers for user space

2010-08-22 21:15:39 -07:00

xt_iprange.h

…

xt_ipvs.h

netfilter: fix userspace header warning

2010-08-18 23:34:26 -07:00

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

…

xt_NFLOG.h

…

xt_NFQUEUE.h

…

xt_osf.h

…

xt_owner.h

…

xt_physdev.h

…

xt_pkttype.h

…

xt_policy.h

…

xt_quota.h

xt_quota: report initial quota value instead of current value to userspace

2010-07-23 14:07:47 +02:00

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

…

xt_statistic.h

…

xt_string.h

…

xt_tcpmss.h

…

xt_TCPMSS.h

…

xt_TCPOPTSTRIP.h

…

xt_tcpudp.h

…

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

…