Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

8c56a347

Commit 8c56a347 authored 17 years ago by David S. Miller

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

parents d892afe2 24c667db

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/dccp.h 6 additions, 6 deletions

include/linux/dccp.h
net/dccp/ccids/ccid2.c 0 additions, 4 deletions

net/dccp/ccids/ccid2.c
net/dccp/ccids/ccid3.c 7 additions, 8 deletions

net/dccp/ccids/ccid3.c
net/dccp/input.c 39 additions, 9 deletions

net/dccp/input.c
net/dccp/ipv4.c 3 additions, 3 deletions

net/dccp/ipv4.c
net/dccp/ipv6.c 2 additions, 2 deletions

net/dccp/ipv6.c
net/dccp/options.c 22 additions, 11 deletions

net/dccp/options.c

with 79 additions and 43 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