Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 (fd1cc480) · Commits · Linaro / qcomlt / kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kernel
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

fd1cc480

Commit fd1cc480 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 577c9c45 83731671

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/net/netfilter/nf_conntrack_expect.h 4 additions, 1 deletion

include/net/netfilter/nf_conntrack_expect.h
net/ipv6/netfilter/ip6_tables.c 2 additions, 0 deletions

net/ipv6/netfilter/ip6_tables.c
net/netfilter/Kconfig 1 addition, 1 deletion

net/netfilter/Kconfig
net/netfilter/nf_conntrack_expect.c 6 additions, 24 deletions

net/netfilter/nf_conntrack_expect.c

with 13 additions and 26 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