Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (41499bd6) · Commits · E-EXK4 - Operating System Group / projects / Linux · GitLab

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

41499bd6

Commit 41499bd6 authored 14 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 622e0ca1 7ea7b858

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/netfilter/x_tables.h 1 addition, 1 deletion

include/linux/netfilter/x_tables.h
include/net/netfilter/nf_conntrack_core.h 1 addition, 1 deletion

include/net/netfilter/nf_conntrack_core.h
net/netfilter/nf_conntrack_core.c 10 additions, 0 deletions

net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_sip.c 4 additions, 8 deletions

net/netfilter/nf_conntrack_sip.c

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