Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (1d8674ed) · Commits · Linaro / qcomlt / kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kernel
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

1d8674ed

Commit 1d8674ed authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents d99901d6 cb7b593c

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

include/linux/dccp.h 3 additions, 0 deletions

include/linux/dccp.h
net/dccp/ccids/ccid3.c 89 additions, 74 deletions

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

net/dccp/ccids/ccid3.h
net/dccp/ccids/lib/packet_history.h 2 additions, 1 deletion

net/dccp/ccids/lib/packet_history.h
net/dccp/dccp.h 4 additions, 12 deletions

net/dccp/dccp.h
net/dccp/input.c 2 additions, 2 deletions

net/dccp/input.c
net/dccp/ipv4.c 1 addition, 0 deletions

net/dccp/ipv4.c
net/dccp/minisocks.c 1 addition, 0 deletions

net/dccp/minisocks.c
net/dccp/options.c 61 additions, 29 deletions

net/dccp/options.c
net/ipv4/af_inet.c 0 additions, 13 deletions

net/ipv4/af_inet.c
net/ipv4/fib_trie.c 385 additions, 419 deletions

net/ipv4/fib_trie.c

with 557 additions and 555 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