| commit | c203b33d2ee34594f6656c033cddd4f5860eb06c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Mar 28 14:00:27 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Mar 28 14:00:27 2007 -0700 |
| tree | b59fec34142a6d99df85a0d3576bdf7249308e07 | |
| parent | a26b5fce06b92b2f02967d4c845fa628024e5414 [diff] | |
| parent | 39ebc0276bada8bb70e067cb6d0eb71839c0fb08 [diff] |
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: [DCCP] getsockopt: Fix DCCP_SOCKOPT_[SEND,RECV]_CSCOV