From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 16 Jun 2007 00:05:58 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.22-rc5~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fa04a008a16ac633a55f41baf9e84b551e613e7e;p=linux-2.6-omap-h63xx.git

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [RXRPC] net/rxrpc/ar-connection.c: fix NULL dereference
  [TCP]: Fix logic breakage due to DSACK separation
  [TCP]: Congestion control API RTT sampling fix
---

fa04a008a16ac633a55f41baf9e84b551e613e7e