diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-26 17:45:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-26 17:45:56 -0400 |
| commit | 6288c338661cc26ea66e7818b0d3862ee163fd1d (patch) | |
| tree | 49fbca961371119f8c0d476063fa3c7c0ab7124b /net/dccp/dccp.h | |
| parent | 8b66a454bf09958b474d12981996287d19aa462d (diff) | |
| parent | e675c0d2bf523a80098c843603ccc091d3720fb4 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] zcrypt: Fix ap_poll_requests counter in lost requests error path.
[S390] zcrypt: Fix possible dead lock in AP bus module.
[S390] cio: Device status validity.
[S390] kprobes: Align probe address.
[S390] Fix TCP/UDP pseudo header checksum computation.
[S390] dasd: Work around gcc bug.
Diffstat (limited to 'net/dccp/dccp.h')
0 files changed, 0 insertions, 0 deletions