Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 (1c41e238) · Commits · Bryan O'Donoghue / Kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kernel
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

1c41e238

Commit 1c41e238 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 29fe1b48 37e55cf0

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/nfnetlink_conntrack.h 1 addition, 0 deletions

include/linux/netfilter/nfnetlink_conntrack.h
net/bridge/br_netfilter.c 9 additions, 1 deletion

net/bridge/br_netfilter.c
net/netfilter/Kconfig 2 additions, 2 deletions

net/netfilter/Kconfig
net/netfilter/nf_conntrack_proto_dccp.c 15 additions, 1 deletion

net/netfilter/nf_conntrack_proto_dccp.c
net/netfilter/nf_conntrack_proto_udplite.c 1 addition, 0 deletions

net/netfilter/nf_conntrack_proto_udplite.c
net/netfilter/xt_recent.c 4 additions, 5 deletions

net/netfilter/xt_recent.c

with 32 additions and 9 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