Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 01:20:32 +0000 (18:20 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 01:20:32 +0000 (18:20 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BNX2]: Fix occasional NETDEV WATCHDOG on 5709.
  [IPV6]: Disallow RH0 by default.
  [XFRM]: beet: fix pseudo header length value
  [TCP]: Congestion control initialization.


Trivial merge