Skip to content
Commit aadd51aa authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next



Resolve conflicts between 5888b93b ("Merge branch 'nf-hook-compress'") and
Florian Westphal br_netfilter works.

Conflicts:
        net/bridge/br_netfilter.c

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 68e942e8 ee90b812
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment