Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Mar 2007 21:00:27 +0000 (14:00 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Mar 2007 21:00:27 +0000 (14:00 -0700)
commitc203b33d2ee34594f6656c033cddd4f5860eb06c
treeb59fec34142a6d99df85a0d3576bdf7249308e07
parenta26b5fce06b92b2f02967d4c845fa628024e5414
parent39ebc0276bada8bb70e067cb6d0eb71839c0fb08
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