• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 10799db6
    Linus Torvalds authored
    * 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
    10799db6
net_namespace.h 6.64 KB