tree 28ca52d17183cb1d732b1324fce4f7b5d6b3dfc0
parent 68e942e88add0ac8576fc8397e86495edf3dcea7
parent ee90b81203a91d4e5385622811ee7872b5bcfe76
author Pablo Neira Ayuso <pablo@netfilter.org> 1428507617 +0200
committer Pablo Neira Ayuso <pablo@netfilter.org> 1428510621 +0200

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

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

Conflicts:
        net/bridge/br_netfilter.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>