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

Conflicts:
	drivers/net/can/usb/ems_usb.c

2009-11-08 23:00:54 -08:00

..

ipvs

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

core.c

…

Kconfig

…

Makefile

…

nf_conntrack_acct.c

…

nf_conntrack_amanda.c

…

nf_conntrack_core.c

netfilter: nf_nat: fix NAT issue in 2.6.30.4+

2009-11-06 00:43:42 -08:00

nf_conntrack_ecache.c

…

nf_conntrack_expect.c

nf_conntrack: Use rcu_barrier()

2009-06-25 16:32:52 +02:00

nf_conntrack_extend.c

nf_conntrack: Use rcu_barrier()

2009-06-25 16:32:52 +02:00

nf_conntrack_ftp.c

…

nf_conntrack_h323_asn1.c

…

nf_conntrack_h323_main.c

…

nf_conntrack_h323_types.c

…

nf_conntrack_helper.c

…

nf_conntrack_irc.c

…

nf_conntrack_l3proto_generic.c

…

nf_conntrack_netbios_ns.c

…

nf_conntrack_netlink.c

netfilter: nfnetlink: constify message attributes and headers

2009-08-25 16:07:58 +02:00

nf_conntrack_pptp.c

…

nf_conntrack_proto_dccp.c

…

nf_conntrack_proto_generic.c

…

nf_conntrack_proto_gre.c

…

nf_conntrack_proto_sctp.c

…

nf_conntrack_proto_tcp.c

netfilter: nf_nat: fix NAT issue in 2.6.30.4+

2009-11-06 00:43:42 -08:00

nf_conntrack_proto_udp.c

…

nf_conntrack_proto_udplite.c

…

nf_conntrack_proto.c

…

nf_conntrack_sane.c

…

nf_conntrack_sip.c

…

nf_conntrack_standalone.c

…

nf_conntrack_tftp.c

…

nf_internals.h

…

nf_log.c

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

nf_queue.c

…

nf_sockopt.c

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

nf_tproxy_core.c

…

nfnetlink_log.c

netfilter: nfnetlink: constify message attributes and headers

2009-08-25 16:07:58 +02:00

nfnetlink_queue.c

netfilter: nfnetlink: constify message attributes and headers

2009-08-25 16:07:58 +02:00

nfnetlink.c

netfilter: nfnetlink: constify message attributes and headers

2009-08-25 16:07:58 +02:00

x_tables.c

mm: replace various uses of num_physpages by totalram_pages

2009-09-22 07:17:38 -07:00

xt_CLASSIFY.c

…

xt_cluster.c

netfilter: fix some sparse endianess warnings

2009-06-22 14:15:02 +02:00

xt_comment.c

…

xt_connbytes.c

…

xt_connlimit.c

netfilter: xt_connlimit: fix regression caused by zero family value

2009-11-06 18:08:32 -08:00

xt_connmark.c

netfilter: xtables: remove xt_connmark v0

2009-08-10 12:25:12 +02:00

xt_CONNMARK.c

netfilter: xtables: remove xt_CONNMARK v0

2009-08-10 12:25:11 +02:00

xt_CONNSECMARK.c

…

xt_conntrack.c

netfilter: xtables: remove xt_conntrack v0

2009-08-10 13:09:44 +02:00

xt_dccp.c

…

xt_dscp.c

netfilter: xtables: remove xt_TOS v0

2009-08-10 12:25:11 +02:00

xt_DSCP.c

netfilter: xtables: remove xt_TOS v0

2009-08-10 12:25:11 +02:00

xt_esp.c

…

xt_hashlimit.c

mm: replace various uses of num_physpages by totalram_pages

2009-09-22 07:17:38 -07:00

xt_helper.c

…

xt_hl.c

…

xt_HL.c

…

xt_iprange.c

netfilter: xtables: remove xt_iprange v0

2009-08-10 13:09:44 +02:00

xt_LED.c

…

xt_length.c

…

xt_limit.c

…

xt_mac.c

…

xt_mark.c

netfilter: xtables: remove xt_mark v0

2009-08-10 13:09:45 +02:00

xt_MARK.c

netfilter: xtables: remove xt_MARK v0, v1

2009-08-10 12:25:12 +02:00

xt_multiport.c

…

xt_NFLOG.c

…

xt_NFQUEUE.c

netfilter: fix some sparse endianess warnings

2009-06-22 14:15:02 +02:00

xt_NOTRACK.c

…

xt_osf.c

netfilter: nfnetlink: constify message attributes and headers

2009-08-25 16:07:58 +02:00

xt_owner.c

netfilter: xtables: remove xt_owner v0

2009-08-10 13:32:30 +02:00

xt_physdev.c

…

xt_pkttype.c

…

xt_policy.c

…

xt_quota.c

netfilter: xt_quota: fix wrong return value (error case)

2009-08-23 19:09:23 -07:00

xt_rateest.c

netfilter: xt_rateest: fix comparison with self

2009-06-22 14:17:12 +02:00

xt_RATEEST.c

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

xt_realm.c

…

xt_recent.c

…

xt_sctp.c

…

xt_SECMARK.c

…

xt_socket.c

inet: rename some inet_sock fields

2009-10-18 18:52:53 -07:00

xt_state.c

…

xt_statistic.c

…

xt_string.c

…

xt_tcpmss.c

…

xt_TCPMSS.c

…

xt_TCPOPTSTRIP.c

…

xt_tcpudp.c

…

xt_time.c

…

xt_TPROXY.c

…

xt_TRACE.c

…

xt_u32.c

…