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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: Kill ratelimit.h dependency in linux/net.h
  net: Add linux/sysctl.h includes where needed.
  net: Kill ether_table[] declaration.
  inetpeer: fix race in unused_list manipulations
  atm: expose ATM device index in sysfs
  IPVS: bug in ip_vs_ftp, same list heaad used in all netns.
  bug.h: Move ratelimit warn interfaces to ratelimit.h
  bonding: cleanup module option descriptions
  net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.
  net: davinci_emac: fix dev_err use at probe
  can: convert to %pK for kptr_restrict support
  net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags
  netfilter: Fix several warnings in compat_mtw_from_user().
  netfilter: ipset: fix ip_set_flush return code
  netfilter: ipset: remove unused variable from type_pf_tdel()
  netfilter: ipset: Use proper timeout value to jiffies conversion

diff --combined include/net/net_namespace.h
index dcc8f5749d3fa5d799e9bc7acff9ab279b864ca3,07a60e8b749ed876f2e4ffa229ebdd2d674d6c42..2bf9ed9ef26b266a583550238e8433861d218c80
--- 1/include/net/net_namespace.h
--- 2/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@@ -7,6 -7,7 +7,7 @@@
  #include <asm/atomic.h>
  #include <linux/workqueue.h>
  #include <linux/list.h>
+ #include <linux/sysctl.h>
  
  #include <net/netns/core.h>
  #include <net/netns/mib.h>
@@@ -119,7 -120,6 +120,7 @@@ static inline struct net *copy_net_ns(u
  extern struct list_head net_namespace_list;
  
  extern struct net *get_net_ns_by_pid(pid_t pid);
 +extern struct net *get_net_ns_by_fd(int pid);
  
  #ifdef CONFIG_NET_NS
  extern void __put_net(struct net *net);