Linus Torvalds d7fc02c7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits) mac80211: fix reorder buffer release iwmc3200wifi: Enable wimax core through module parameter iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter iwmc3200wifi: Coex table command does not expect a response iwmc3200wifi: Update wiwi priority table iwlwifi: driver version track kernel version iwlwifi: indicate uCode type when fail dump error/event log iwl3945: remove duplicated event logging code b43: fix two warnings ipw2100: fix rebooting hang with driver loaded cfg80211: indent regulatory messages with spaces iwmc3200wifi: fix NULL pointer dereference in pmkid update mac80211: Fix TX status reporting for injected data frames ath9k: enable 2GHz band only if the device supports it airo: Fix integer overflow warning rt2x00: Fix padding bug on L2PAD devices. WE: Fix set events not propagated b43legacy: avoid PPC fault during resume b43: avoid PPC fault during resume tcp: fix a timewait refcnt race ... Fix up conflicts due to sysctl cleanups (dead sysctl_check code and CTL_UNNUMBERED removed) in kernel/sysctl_check.c net/ipv4/sysctl_net_ipv4.c net/ipv6/addrconf.c net/sctp/sysctl.c		2009-12-08 07:55:01 -08:00
..
ipvs	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
core.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
Makefile
nf_conntrack_acct.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
nf_conntrack_amanda.c
nf_conntrack_core.c	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_ecache.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
nf_conntrack_expect.c	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
nf_conntrack_extend.c	nf_conntrack: Use rcu_barrier()	2009-06-25 16:32:52 +02:00
nf_conntrack_ftp.c	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
nf_conntrack_h323_asn1.c
nf_conntrack_h323_main.c
nf_conntrack_h323_types.c
nf_conntrack_helper.c	netfilter: conntrack: move helper destruction to nf_ct_helper_destroy()	2009-06-13 12:28:22 +02:00
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
nf_conntrack_proto_generic.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
nf_conntrack_proto_gre.c	net: Simplify conntrack_proto_gre pernet operations.	2009-12-01 16:15:55 -08:00
nf_conntrack_proto_sctp.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
nf_conntrack_proto_tcp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
nf_conntrack_proto_udp.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
nf_conntrack_proto_udplite.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
nf_conntrack_proto.c
nf_conntrack_sane.c
nf_conntrack_sip.c
nf_conntrack_standalone.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
nf_conntrack_tftp.c
nf_internals.h
nf_log.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08: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	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
nfnetlink_queue.c	netfilter: remove unneccessary checks from netlink notifiers	2009-11-06 17:04:00 +01: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: fix conntrack match v1 ipt-save output	2009-11-23 10:43:57 +01: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	netfilter: xt_limit: fix invalid return code in limit_mt_check()	2009-11-23 13:37:23 +01:00
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: xt_osf: fix xt_osf_remove_callback() return value	2009-11-19 13:16:26 -08: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	netfilter: xt_socket: make module available for INPUT chain	2009-10-29 15:35:10 +01: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