git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

author	Pablo Neira Ayuso <pablo@netfilter.org>
	Wed, 8 Apr 2015 15:40:17 +0000 (17:40 +0200)
committer	Pablo Neira Ayuso <pablo@netfilter.org>
	Wed, 8 Apr 2015 16:30:21 +0000 (18:30 +0200)
commit	aadd51aa71f8d013c818a312bb2a0c5714830dbc
tree	28ca52d17183cb1d732b1324fce4f7b5d6b3dfc0	tree \| snapshot (tar.gz zip)
parent	68e942e88add0ac8576fc8397e86495edf3dcea7	commit \| diff
parent	ee90b81203a91d4e5385622811ee7872b5bcfe76	commit \| diff

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>

Motorola kernel-slsi

RSS Atom

include/linux/netfilter_bridge.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_queue.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_queue_core.c	diff1 \|	diff2 \|	blob \| history