Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commitc5b875e354a54e2b5ba24eecae69bf94e025edd5
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Nov 2007 23:07:57 +0000 (9 15:07 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Nov 2007 23:07:57 +0000 (9 15:07 -0800)
tree0446a68d99ad50305ab78835456d9faa62be5948
parenteae1920a21b4f87e89cea802e7df39442b119617
parentc3d8d1e30cace31fed6186a4b8c6b1401836d89c
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (44 commits)
  [NETLINK]: Fix unicast timeouts
  [INET]: Remove per bucket rwlock in tcp/dccp ehash table.
  [IPVS]: Synchronize closing of Connections
  [IPVS]: Bind connections on stanby if the destination exists
  [NET]: Remove Documentation/networking/pt.txt
  [NET]: Remove Documentation/networking/routing.txt
  [NET]: Remove Documentation/networking/ncsa-telnet
  [NET]: Remove comx driver docs.
  [NET]: Remove Documentation/networking/Configurable
  [NET]: Clean proto_(un)register from in-code ifdefs
  [IPSEC]: Fix crypto_alloc_comp error checking
  [VLAN]: Fix SET_VLAN_INGRESS_PRIORITY_CMD ioctl
  [NETNS]: Fix compiler error in net_namespace.c
  [TTY]: Use tty_mode_ioctl() in network drivers.
  [TTY]: Fix network driver interactions with TCGET/SET calls.
  [PKT_SCHED] CLS_U32: Fix endianness problem with u32 classifier hash masks.
  [NET]: Removing duplicit #includes
  [NET]: Let USB_USBNET always select MII.
  [RRUNNER]: Do not muck with sysctl_{r,w}mem_max
  [DLM] lowcomms: Do not muck with sysctl_rmem_max.
  ...