Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

31b683b6

Commit 31b683b6 authored 15 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents b7a9216c dce766af

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

net/bridge/netfilter/ebtables.c 6 additions, 0 deletions

net/bridge/netfilter/ebtables.c
net/netfilter/ipvs/Kconfig 2 additions, 1 deletion

net/netfilter/ipvs/Kconfig
net/netfilter/ipvs/ip_vs_ctl.c 13 additions, 1 deletion

net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/ipvs/ip_vs_wrr.c 1 addition, 14 deletions

net/netfilter/ipvs/ip_vs_wrr.c
net/netfilter/nf_conntrack_ftp.c 9 additions, 9 deletions

net/netfilter/nf_conntrack_ftp.c

with 31 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