Linus Torvalds 2685b267bc Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
  [NETFILTER]: Fix non-ANSI func. decl.
  [TG3]: Identify Serdes devices more clearly.
  [TG3]: Use msleep.
  [TG3]: Use netif_msg_*.
  [TG3]: Allow partial speed advertisement.
  [TG3]: Add TG3_FLG2_IS_NIC flag.
  [TG3]: Add 5787F device ID.
  [TG3]: Fix Phy loopback.
  [WANROUTER]: Kill kmalloc debugging code.
  [TCP] inet_twdr_hangman: Delete unnecessary memory barrier().
  [NET]: Memory barrier cleanups
  [IPSEC]: Fix inetpeer leak in ipv4 xfrm dst entries.
  audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=n
  audit: Add auditing to ipsec
  [IRDA] irlan: Fix compile warning when CONFIG_PROC_FS=n
  [IrDA]: Incorrect TTP header reservation
  [IrDA]: PXA FIR code device model conversion
  [GENETLINK]: Fix misplaced command flags.
  [NETLIK]: Add a pointer to the Generic Netlink wiki page.
  [IPV6] RAW: Don't release unlocked sock.
  ...

2006-12-07 09:05:15 -08:00

..

core.c

[NETFILTER]: More __read_mostly annotations

2006-12-02 21:31:08 -08:00

Kconfig

[NETFILTER]: Mark old IPv4-only connection tracking scheduled for removal

2006-12-02 22:11:01 -08:00

Makefile

[NETFILTER]: nf_conntrack/nf_nat: add TFTP helper port

2006-12-02 22:10:18 -08:00

nf_conntrack_amanda.c

[NETFILTER]: nf_conntrack: fix header inclusions for helpers

2006-12-02 22:12:54 -08:00

nf_conntrack_core.c

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

2006-12-07 09:05:15 -08:00

nf_conntrack_ecache.c

[NETFILTER]: nf_conntrack: fix header inclusions for helpers

2006-12-02 22:12:54 -08:00

nf_conntrack_expect.c

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

2006-12-07 09:05:15 -08:00

nf_conntrack_ftp.c

[NETFILTER]: nf_nat: add FTP NAT helper port

2006-12-02 22:07:44 -08:00

nf_conntrack_h323_asn1.c

[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port

2006-12-02 22:08:46 -08:00

nf_conntrack_h323_main.c

[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port

2006-12-02 22:08:46 -08:00

nf_conntrack_h323_types.c

[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port

2006-12-02 22:08:46 -08:00

nf_conntrack_helper.c

[NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanup

2006-12-02 22:11:25 -08:00

nf_conntrack_irc.c

[NETFILTER]: nf_conntrack/nf_nat: add IRC helper port

2006-12-02 22:09:06 -08:00

nf_conntrack_l3proto_generic.c

[NETFILTER]: nf_conntrack: /proc compatibility with old connection tracking

2006-12-02 21:31:20 -08:00

nf_conntrack_netbios_ns.c

[NETFILTER]: nf_conntrack: fix header inclusions for helpers

2006-12-02 22:12:54 -08:00

nf_conntrack_netlink.c

[NETFILTER]: Add NAT support for nf_conntrack

2006-12-02 22:07:13 -08:00

nf_conntrack_pptp.c

[NETFILTER]: nf_conntrack/nf_nat: add PPTP helper port

2006-12-02 22:09:41 -08:00

nf_conntrack_proto_generic.c

[NETFILTER]: nf_conntrack: sysctl compatibility with old connection tracking

2006-12-02 21:31:19 -08:00

nf_conntrack_proto_gre.c

[NETFILTER]: nf_conntrack/nf_nat: add PPTP helper port

2006-12-02 22:09:41 -08:00

nf_conntrack_proto_sctp.c

[NETFILTER]: nf_conntrack: add module aliases to IPv4 conntrack names

2006-12-02 22:06:05 -08:00

nf_conntrack_proto_tcp.c

[NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanup

2006-12-02 22:11:25 -08:00

nf_conntrack_proto_udp.c

[NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanup

2006-12-02 22:11:25 -08:00

nf_conntrack_proto.c

[NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanup

2006-12-02 22:11:25 -08:00

nf_conntrack_sip.c

[NETFILTER]: nf_conntrack: fix header inclusions for helpers

2006-12-02 22:12:54 -08:00

nf_conntrack_standalone.c

[NETFILTER]: nf_conntrack: EXPORT_SYMBOL cleanup

2006-12-02 22:11:25 -08:00

nf_conntrack_tftp.c

[NETFILTER]: nf_conntrack: fix header inclusions for helpers

2006-12-02 22:12:54 -08:00

nf_internals.h

[NETFILTER]: nf_queue: handle GSO packets

2006-09-22 14:53:55 -07:00

nf_log.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

nf_queue.c

[NETFILTER]: nf_queue: handle GSO packets

2006-09-22 14:53:55 -07:00

nf_sockopt.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

nf_sysctl.c

[NETFILTER]: nf_conntrack: automatic sysctl registation for conntrack protocols

2006-12-02 21:31:17 -08:00

nfnetlink_log.c

[NETFILTER]: nfnetlink_log: remove useless prefix length limitation

2006-12-02 21:31:30 -08:00

nfnetlink_queue.c

[NETFILTER]: nfnetlink_queue: allow changing queue length through netlink

2006-12-02 21:31:29 -08:00

nfnetlink.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

x_tables.c

[PATCH] severing skbuff.h -> mm.h

2006-12-04 02:00:34 -05:00

xt_CLASSIFY.c

[NETFILTER]: x_tables: remove unused argument to target functions

2006-09-22 14:55:33 -07:00

xt_comment.c

[NETFILTER]: x_tables: make use of mass registation helpers

2006-09-22 14:55:32 -07:00

xt_connbytes.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_connmark.c

[NETFILTER]: fix cut-and-paste error in exit functions

2006-10-15 23:14:06 -07:00

xt_CONNMARK.c

[NETFILTER]: nf_conntrack: split out the event cache

2006-12-02 21:31:06 -08:00

xt_CONNSECMARK.c

[NETFILTER]: x_tables: Fix typos after conversion to use mass registation helper

2006-09-22 14:55:40 -07:00

xt_conntrack.c

[NETFILTER]: xt_conntrack: clean up overly long lines

2006-09-22 15:19:46 -07:00

xt_dccp.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_dscp.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_DSCP.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_esp.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_hashlimit.c

[PATCH] slab: remove kmem_cache_t

2006-12-07 08:39:25 -08:00

xt_helper.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_length.c

[NETFILTER]: x_tables: make use of mass registation helpers

2006-09-22 14:55:32 -07:00

xt_limit.c

[NETFILTER]: xt_limit: add compat conversion functions

2006-09-22 15:20:06 -07:00

xt_mac.c

[NETFILTER]: x_tables: make use of mass registation helpers

2006-09-22 14:55:32 -07:00

xt_mark.c

[NET]: Turn nfmark into generic mark

2006-12-02 21:21:38 -08:00

xt_MARK.c

[NET]: Turn nfmark into generic mark

2006-12-02 21:21:38 -08:00

xt_multiport.c

[NET]: Supporting UDP-Lite (RFC 3828) in Linux

2006-12-02 21:22:46 -08:00

xt_NFLOG.c

[NETFILTER]: x_tables: add NFLOG target

2006-12-02 21:31:31 -08:00

xt_NFQUEUE.c

[NETFILTER]: fix cut-and-paste error in exit functions

2006-10-15 23:14:06 -07:00

xt_NOTRACK.c

[NETFILTER]: x_tables: remove unused argument to target functions

2006-09-22 14:55:33 -07:00

xt_physdev.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_pkttype.c

[NETFILTER]: x_tables: make use of mass registation helpers

2006-09-22 14:55:32 -07:00

xt_policy.c

[NETFILTER]: xt_policy: remove dups in .family

2006-09-22 15:19:56 -07:00

xt_quota.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_realm.c

[NETFILTER]: Rename init functions.

2006-03-28 17:02:48 -08:00

xt_sctp.c

[SCTP]: Netfilter sctp annotations.

2006-12-02 21:27:12 -08:00

xt_SECMARK.c

[NETFILTER]: x_tables: Fix typos after conversion to use mass registation helper

2006-09-22 14:55:40 -07:00

xt_state.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_statistic.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_string.c

[NETFILTER]: x_tables: remove unused size argument to check/destroy functions

2006-09-22 14:55:34 -07:00

xt_tcpmss.c

[NETFILTER]: xt_tcpmss: minor cleanups

2006-09-22 14:55:38 -07:00

xt_tcpudp.c

[NET]: Supporting UDP-Lite (RFC 3828) in Linux

2006-12-02 21:22:46 -08:00