Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

58bf2dbc

Commit 58bf2dbc authored 13 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

parents 86e4ca66 c74c0bfe

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/netfilter/ipset/ip_set_ahash.h 2 additions, 2 deletions

include/linux/netfilter/ipset/ip_set_ahash.h
include/linux/netfilter/ipset/ip_set_timeout.h 10 additions, 8 deletions

include/linux/netfilter/ipset/ip_set_timeout.h
include/net/ip_vs.h 2 additions, 1 deletion

include/net/ip_vs.h
net/bridge/netfilter/ebtables.c 4 additions, 2 deletions

net/bridge/netfilter/ebtables.c
net/netfilter/ipset/ip_set_core.c 1 addition, 1 deletion

net/netfilter/ipset/ip_set_core.c
net/netfilter/ipvs/ip_vs_ftp.c 19 additions, 8 deletions

net/netfilter/ipvs/ip_vs_ftp.c

with 38 additions and 22 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