Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

912cbe3c

Commit 912cbe3c authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 0f3278d1 52ab4ac2

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Documentation/DocBook/kernel-api.tmpl 3 additions, 3 deletions

Documentation/DocBook/kernel-api.tmpl
include/linux/etherdevice.h 16 additions, 11 deletions

include/linux/etherdevice.h
net/core/datagram.c 4 additions, 0 deletions

net/core/datagram.c
net/ipv4/igmp.c 4 additions, 1 deletion

net/ipv4/igmp.c
net/ipv4/tcp_bic.c 1 addition, 1 deletion

net/ipv4/tcp_bic.c
net/ipv6/addrconf.c 1 addition, 1 deletion

net/ipv6/addrconf.c
net/ipv6/mcast.c 3 additions, 1 deletion

net/ipv6/mcast.c
net/sched/Kconfig 195 additions, 199 deletions

net/sched/Kconfig

with 227 additions and 217 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