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

7775aa76

Commit 7775aa76 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 93544cc6 78872ccb

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/netfilter_ipv4.h 1 addition, 1 deletion

include/linux/netfilter_ipv4.h
net/bridge/br_stp_if.c 2 additions, 2 deletions

net/bridge/br_stp_if.c
net/ipv4/netfilter.c 41 additions, 0 deletions

net/ipv4/netfilter.c
net/ipv4/netfilter/ip_nat_standalone.c 3 additions, 3 deletions

net/ipv4/netfilter/ip_nat_standalone.c

with 47 additions and 6 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