Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit2a4f739dfc59edd52eaa37d63af1bd830ea42318
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 14:44:07 +0000 (26 07:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 14:44:07 +0000 (26 07:44 -0700)
tree962bb3b4bfc6de0b8d5f8cfd90b1bb6c5eadc338
parent0bb78c3715ec9ee528d92177bc94ffcc94bed5a8
parent1842c4bef61f985fbec6df7150041b85d8b52b1a
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BRIDGE]: correct print message typo
  [TCP] H-TCP: fix integer overflow
  [TCP] cubic: scaling error