tree eaea109bceaa7f62db1dd82d8844197363f578c8
parent 85ba94ba0592296053f7f2846812173424afe1cb
parent 9d2c27e17b7574023b5adb5c6a50d7aaeb915543
author Linus Torvalds <torvalds@linux-foundation.org> 1223491219 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223491219 -0700

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:
  tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd.
  net: Fix netdev_run_todo dead-lock
  tcp: Fix possible double-ack w/ user dma
  net: only invoke dev->change_rx_flags when device is UP
  netrom: Fix sock_orphan() use in nr_release
  ax25: Quick fix for making sure unaccepted sockets get destroyed.
  Revert "ax25: Fix std timer socket destroy handling."
  [Bluetooth] Add reset quirk for A-Link BlueUSB21 dongle
  [Bluetooth] Add reset quirk for new Targus and Belkin dongles
  [Bluetooth] Fix double frees on error paths of btusb and bpa10x drivers