From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 8 Apr 2015 15:40:17 +0000 (+0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~38^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aadd51aa71f8d013c818a312bb2a0c5714830dbc;p=pandora-kernel.git

Merge git://git./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>
---

aadd51aa71f8d013c818a312bb2a0c5714830dbc
Reading git-diff-tree failed