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

4ada8107

Commit 4ada8107 authored 16 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 303c6a02 d1238d53

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/net/netfilter/nf_conntrack_core.h 2 additions, 1 deletion

include/net/netfilter/nf_conntrack_core.h
net/ipv6/netfilter/nf_conntrack_reasm.c 4 additions, 4 deletions

net/ipv6/netfilter/nf_conntrack_reasm.c
net/netfilter/nf_conntrack_core.c 1 addition, 1 deletion

net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c 1 addition, 0 deletions

net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_proto_tcp.c 2 additions, 2 deletions

net/netfilter/nf_conntrack_proto_tcp.c

with 10 additions and 8 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