tree f636ecb2ff88ae724243445b6eef2e6b2d773200
parent 37b0d1dedcedf555e2940bc7702c11e2b572299f
parent 42d1d52e695d87475846e9a09964cae1209eeecb
author Linus Torvalds <torvalds@g5.osdl.org> 1150145187 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1150145187 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4]: Increment ipInHdrErrors when TTL expires.
  [TCP]: continued: reno sacked_out count fix
  [DCCP] Ackvec: fix soft lockup in ackvec handling code