Pablo Neira Ayuso f20fbc0717 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Conflicts: net/netfilter/core.c net/netfilter/nf_tables_netdev.c Resolve two conflicts before pull request for David's net-next tree: 1) Between c73c248490 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment") from the net tree and commit ddc8b6027a ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()"). 2) Between e8bffe0cf9 ("net: Add _nf_(un)register_hooks symbols") and Aaron Conole's patches to replace list_head with single linked list. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2016-09-25 23:34:19 +02:00
..
conntrack.h	netfilter: remove ip_conntrack* sysctl compat code	2016-08-13 13:27:13 +02:00
core.h	…
dccp.h	…
generic.h	…
hash.h	…
ieee802154_6lowpan.h	…
ipv4.h	…
ipv6.h	…
mib.h	…
mpls.h	…
netfilter.h	netfilter: replace list_head with single linked list	2016-09-25 14:38:48 +02:00
nftables.h	…
packet.h	…
sctp.h	…
unix.h	…
x_tables.h	…
xfrm.h	xfrm: state: remove per-netns gc task	2016-08-24 13:16:06 +02:00