David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-22 00:44:59 -07:00
..
ipv4	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables	2014-01-06 13:29:30 -05:00
ipv6	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables	2014-01-06 13:29:30 -05:00
nf_conntrack.h	netfilter: conntrack: spinlock per cpu to protect special lists.	2014-03-07 11:40:38 +01:00
nf_conntrack_acct.h	netfilter: introduce nf_conn_acct structure	2013-11-03 21:48:49 +01:00
nf_conntrack_core.h	netfilter: conntrack: remove central spinlock nf_conntrack_lock	2014-03-07 11:41:13 +01:00
nf_conntrack_ecache.h	netfilter: conntrack: remove timer from ecache extension	2014-06-25 19:15:38 +02:00
nf_conntrack_expect.h	netfilter: rename netlink related "pid" variables to "portid"	2013-04-19 14:58:36 -04:00
nf_conntrack_extend.h	netfilter: nf_conntrack: reserve two bytes for nf_ct_ext->len	2014-04-03 23:52:31 +02:00
nf_conntrack_helper.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_conntrack_l3proto.h	netfilter: nf_conntrack: remove dead code	2014-01-03 23:41:37 +01:00
nf_conntrack_l4proto.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_conntrack_labels.h	netfilter: nft_ct: labels get support	2014-02-19 11:41:25 +01:00
nf_conntrack_seqadj.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_conntrack_synproxy.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
nf_conntrack_timeout.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_conntrack_timestamp.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_conntrack_tuple.h	netfilter: nf_nat: export NAT definitions to userspace	2011-12-23 14:36:43 +01:00
nf_conntrack_zones.h	netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=n	2010-02-18 19:04:44 +01:00
nf_log.h	netfilter: bridge: add generic packet logger	2014-06-27 13:20:47 +02:00
nf_nat.h	netfilter: add helper for adding nat extension	2014-04-29 20:56:22 +02:00
nf_nat_core.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_nat_helper.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_nat_l3proto.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_nat_l4proto.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00
nf_queue.h	netfilter: xt_NFQUEUE: separate reusable code	2013-12-07 23:20:45 +01:00
nf_tables.h	netfilter: nf_tables: 64bit stats need some extra synchronization	2014-07-14 12:00:17 +02:00
nf_tables_core.h	netfilter: nf_tables: fix nft_cmp_fast failure on big endian for size < 4	2014-04-14 10:38:02 +02:00
nf_tables_ipv4.h	netfilter: nft_meta: add l4proto support	2014-01-07 23:57:31 +01:00
nf_tables_ipv6.h	netfilter: nft_meta: add l4proto support	2014-01-07 23:57:31 +01:00
nfnetlink_log.h	netfilter: log: netns NULL ptr bug when calling from conntrack	2013-05-15 14:11:07 +02:00
nfnetlink_queue.h	netfilter: nfnetlink_queue: allow to attach expectations to conntracks	2013-08-13 16:32:10 +02:00
nft_meta.h	netfilter: nf_tables: Make meta expression core functions public	2014-04-23 13:55:30 +02:00
nft_reject.h	netfilter: nf_tables: add reject module for NFPROTO_INET	2014-02-06 09:44:18 +01:00
xt_rateest.h	netfilter: Remove extern from function prototypes	2013-09-23 16:29:42 -04:00