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

98e684bd

Commit 98e684bd 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 e254c274 536bb20b

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/dccp.h 4 additions, 2 deletions

include/linux/dccp.h
net/dccp/ccid.h 23 additions, 23 deletions

net/dccp/ccid.h
net/dccp/ccids/ccid3.c 26 additions, 52 deletions

net/dccp/ccids/ccid3.c
net/dccp/ccids/ccid3.h 0 additions, 9 deletions

net/dccp/ccids/ccid3.h
net/dccp/ccids/lib/tfrc.h 1 addition, 0 deletions

net/dccp/ccids/lib/tfrc.h
net/dccp/ccids/lib/tfrc_equation.c 14 additions, 0 deletions

net/dccp/ccids/lib/tfrc_equation.c
net/dccp/options.c 5 additions, 20 deletions

net/dccp/options.c

with 73 additions and 106 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