Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

b3c6aeb3

Commit b3c6aeb3 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents af2eb17b af1afe86

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

net/ipv4/af_inet.c 3 additions, 4 deletions

net/ipv4/af_inet.c
net/ipv4/igmp.c 4 additions, 1 deletion

net/ipv4/igmp.c
net/ipv6/af_inet6.c 33 additions, 14 deletions

net/ipv6/af_inet6.c
net/ipv6/mcast.c 5 additions, 0 deletions

net/ipv6/mcast.c
net/sctp/socket.c 5 additions, 5 deletions

net/sctp/socket.c
net/sctp/transport.c 2 additions, 1 deletion

net/sctp/transport.c

with 52 additions and 25 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