Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

8fa6e3d4

Commit 8fa6e3d4 authored 14 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6

parents c239f279 2f34b329

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

net/dccp/ccid.h 3 additions, 3 deletions

net/dccp/ccid.h
net/dccp/ccids/ccid2.c 1 addition, 1 deletion

net/dccp/ccids/ccid2.c
net/dccp/ccids/ccid3.c 1 addition, 2 deletions

net/dccp/ccids/ccid3.c
net/dccp/dccp.h 36 additions, 8 deletions

net/dccp/dccp.h
net/dccp/input.c 7 additions, 13 deletions

net/dccp/input.c
net/dccp/minisocks.c 9 additions, 21 deletions

net/dccp/minisocks.c
net/dccp/options.c 2 additions, 0 deletions

net/dccp/options.c
net/dccp/output.c 6 additions, 14 deletions

net/dccp/output.c
net/dccp/proto.c 1 addition, 1 deletion

net/dccp/proto.c

with 66 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment