| commit | aadd51aa71f8d013c818a312bb2a0c5714830dbc | [log] [tgz] |
|---|---|---|
| author | Pablo Neira Ayuso <pablo@netfilter.org> | Wed Apr 08 17:40:17 2015 +0200 |
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | Wed Apr 08 18:30:21 2015 +0200 |
| tree | 28ca52d17183cb1d732b1324fce4f7b5d6b3dfc0 | |
| parent | 68e942e88add0ac8576fc8397e86495edf3dcea7 [diff] | |
| parent | ee90b81203a91d4e5385622811ee7872b5bcfe76 [diff] |
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>