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

60dbb011

Commit 60dbb011 authored 14 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of git://1984.lsi.us.es/net-2.6

parents 4b0ef1f2 2f46e079

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

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

include/linux/if_bridge.h
include/linux/netfilter/x_tables.h 5 additions, 5 deletions

include/linux/netfilter/x_tables.h
net/ipv4/netfilter/arp_tables.c 14 additions, 31 deletions

net/ipv4/netfilter/arp_tables.c
net/ipv4/netfilter/ip_tables.c 14 additions, 31 deletions

net/ipv4/netfilter/ip_tables.c
net/ipv6/netfilter/ip6_tables.c 14 additions, 31 deletions

net/ipv6/netfilter/ip6_tables.c
net/netfilter/nf_conntrack_netlink.c 5 additions, 9 deletions

net/netfilter/nf_conntrack_netlink.c
net/netfilter/x_tables.c 2 additions, 1 deletion

net/netfilter/x_tables.c

with 55 additions and 109 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