]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 14:44:07 +0000 (07:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 14:44:07 +0000 (07:44 -0700)
* 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


Trivial merge