From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 28 Mar 2007 21:00:27 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc6~74
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=c203b33d2ee34594f6656c033cddd4f5860eb06c;hp=c203b33d2ee34594f6656c033cddd4f5860eb06c;p=powerpc.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [DCCP] getsockopt: Fix DCCP_SOCKOPT_[SEND,RECV]_CSCOV
---