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

42f9cabe

Commit 42f9cabe authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 97616449 9e147a1c

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

net/ipv4/netfilter/ip_conntrack_ftp.c 2 additions, 2 deletions

net/ipv4/netfilter/ip_conntrack_ftp.c
net/ipv4/netfilter/ip_conntrack_irc.c 2 additions, 2 deletions

net/ipv4/netfilter/ip_conntrack_irc.c
net/ipv4/netfilter/ip_conntrack_tftp.c 2 additions, 2 deletions

net/ipv4/netfilter/ip_conntrack_tftp.c
net/ipv4/tcp_highspeed.c 1 addition, 1 deletion

net/ipv4/tcp_highspeed.c
net/ipv6/route.c 1 addition, 1 deletion

net/ipv6/route.c
net/llc/llc_c_ac.c 4 additions, 4 deletions

net/llc/llc_c_ac.c
net/sched/Kconfig 8 additions, 29 deletions

net/sched/Kconfig

with 20 additions and 41 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