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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/mips/kernel/scall64-n32.S
Simple merge

diff --cc arch/mips/kernel/scall64-o32.S
Simple merge

diff --cc arch/sparc/kernel/systbls_64.S
Simple merge

diff --cc arch/x86/ia32/ia32entry.S
Simple merge

diff --cc drivers/staging/arlan/arlan-proc.c
Simple merge

diff --cc include/linux/syscalls.h
Simple merge

diff --cc include/linux/sysctl.h
Simple merge

diff --cc include/net/dn_dev.h
Simple merge

diff --cc include/net/neighbour.h
Simple merge

diff --cc kernel/sys_ni.c
Simple merge

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/core/sysctl_net_core.c
Simple merge

diff --cc net/decnet/dn_dev.c
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/ip_fragment.c
Simple merge

diff --cc net/ipv4/netfilter.c
Simple merge

diff --cc net/ipv4/netfilter/ip_queue.c
Simple merge

diff --cc net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
Simple merge

diff --cc net/ipv4/netfilter/nf_conntrack_proto_icmp.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/sysctl_net_ipv4.c
index 3000567329532cdd5ca8e678511eaaf1f5b81a4b,13f7ab6ad6a03188ac3551a48b5f98b61aa77c1a..7e3712ce399476be6cfdbc631654a5863fb68bc4
--- 1/net/ipv4/sysctl_net_ipv4.c
--- 2/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@@ -568,7 -712,16 +568,14 @@@ static struct ctl_table ipv4_table[] = 
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
 -              .ctl_name       = CTL_UNNUMBERED,
+       {
+               .procname       = "tcp_cookie_size",
+               .data           = &sysctl_tcp_cookie_size,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec
+       },
        {
 -              .ctl_name       = CTL_UNNUMBERED,
                .procname       = "udp_mem",
                .data           = &sysctl_udp_mem,
                .maxlen         = sizeof(sysctl_udp_mem),

diff --cc net/ipv6/addrconf.c
index f918399c985cda11f78d0887ca25043218e33307,b1ce8fc62049e9bf4c6b97294930c012f0585fb1..de7a194a64ab4fa0cf864d1fe3f83a3974e3b727
--- 1/net/ipv6/addrconf.c
--- 2/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@@ -4284,8 -4387,16 +4319,15 @@@ static struct addrconf_sysctl_tabl
                        .mode           =       0644,
                        .proc_handler   =       proc_dointvec,
                },
 -                      .ctl_name       = CTL_UNNUMBERED,
+               {
+                       .procname       = "force_tllao",
+                       .data           = &ipv6_devconf.force_tllao,
+                       .maxlen         = sizeof(int),
+                       .mode           = 0644,
+                       .proc_handler   = proc_dointvec
+               },
                {
 -                      .ctl_name       =       0,      /* sentinel */
 +                      /* sentinel */
                }
        },
  };

diff --cc net/ipv6/ndisc.c
Simple merge

diff --cc net/ipv6/netfilter/ip6_queue.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
Simple merge

diff --cc net/ipv6/reassembly.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_dccp.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
Simple merge

diff --cc net/sctp/sysctl.c
index d50a042f955272a3294a020d8ccc60858c2da49f,ae03ded2bf1a4a2a10342a2e1bd5ae2c8210eff8..419e1e962c55a06012133252c8e04958465ed915
--- 1/net/sctp/sysctl.c
--- 2/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@@ -241,7 -285,19 +242,18 @@@ static ctl_table sctp_table[] = 
                .extra1         = &zero,
                .extra2         = &addr_scope_max,
        },
-       { }
+       {
 -              .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "rwnd_update_shift",
+               .data           = &sctp_rwnd_upd_shift,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &rwnd_scale_max,
+       },
+ 
 -      { .ctl_name = 0 }
++      { /* sentinel */ }
  };
  
  static struct ctl_path sctp_path[] = {