David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-30 03:55:20 -04:00
..
ipset	netfilter: ipset: set match: add support to match the counters	2013-04-29 20:09:03 +02:00
ipvs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
core.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
Kconfig
Makefile
nf_conntrack_acct.c
nf_conntrack_amanda.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_broadcast.c
nf_conntrack_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2013-04-19 17:55:29 -04:00
nf_conntrack_ecache.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_expect.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2013-04-19 17:55:29 -04:00
nf_conntrack_extend.c
nf_conntrack_ftp.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_h323_asn1.c
nf_conntrack_h323_main.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_h323_types.c
nf_conntrack_helper.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_irc.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_l3proto_generic.c
nf_conntrack_labels.c
nf_conntrack_netbios_ns.c
nf_conntrack_netlink.c	netfilter: ctnetlink: allow to dump expectation per master conntrack	2013-03-19 17:02:18 +01:00
nf_conntrack_pptp.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_proto.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_proto_dccp.c	netfilter: nf_log: prepare net namespace support for loggers	2013-04-05 20:12:54 +02:00
nf_conntrack_proto_generic.c
nf_conntrack_proto_gre.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_proto_sctp.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_proto_tcp.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_proto_udp.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_proto_udplite.c	netfilter: nf_log: prepare net namespace support for loggers	2013-04-05 20:12:54 +02:00
nf_conntrack_sane.c
nf_conntrack_sip.c	netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet	2013-04-06 14:03:18 +02:00
nf_conntrack_snmp.c
nf_conntrack_standalone.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_tftp.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_conntrack_timeout.c
nf_conntrack_timestamp.c
nf_internals.h
nf_log.c	netfilter: enable per netns support for nf_loggers	2013-04-05 21:08:10 +02:00
nf_nat_amanda.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_nat_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2013-04-25 00:53:40 -04:00
nf_nat_ftp.c
nf_nat_helper.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
nf_nat_irc.c
nf_nat_proto_common.c
nf_nat_proto_dccp.c
nf_nat_proto_sctp.c	sctp: Correct type and usage of sctp_end_cksum()	2013-04-29 20:09:08 +02:00
nf_nat_proto_tcp.c
nf_nat_proto_udp.c
nf_nat_proto_udplite.c
nf_nat_proto_unknown.c
nf_nat_sip.c
nf_nat_tftp.c
nf_queue.c	netfilter: move skb_gso_segment into nfnetlink_queue module	2013-04-29 20:09:05 +02:00
nf_sockopt.c
nf_tproxy_core.c
nfnetlink.c	nfnetlink: add support for memory mapped netlink	2013-04-19 14:58:36 -04:00
nfnetlink_acct.c	netfilter: nfnetlink_acct: return -EINVAL if object name is empty	2013-03-25 14:21:30 +01:00
nfnetlink_cthelper.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
nfnetlink_cttimeout.c
nfnetlink_log.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2013-04-19 17:55:29 -04:00
nfnetlink_queue_core.c	netfilter: nfnetlink_queue: avoid expensive gso segmentation and checksum fixup	2013-04-29 20:09:07 +02:00
nfnetlink_queue_ct.c
x_tables.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
xt_addrtype.c
xt_AUDIT.c	netfilter: xt_AUDIT: only generate audit log when audit enabled	2013-03-04 14:45:25 +01:00
xt_bpf.c
xt_CHECKSUM.c
xt_CLASSIFY.c
xt_cluster.c
xt_comment.c
xt_connbytes.c
xt_connlabel.c
xt_connlimit.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
xt_connmark.c
xt_CONNSECMARK.c
xt_conntrack.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
xt_cpu.c
xt_CT.c
xt_dccp.c
xt_devgroup.c
xt_dscp.c
xt_DSCP.c
xt_ecn.c
xt_esp.c
xt_hashlimit.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
xt_helper.c
xt_HL.c
xt_hl.c
xt_HMARK.c
xt_IDLETIMER.c
xt_iprange.c
xt_ipvs.c
xt_LED.c
xt_length.c
xt_limit.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
xt_LOG.c	netfilter: xt_LOG: add net namespace support for xt_LOG	2013-04-05 20:58:45 +02:00
xt_mac.c
xt_mark.c
xt_multiport.c
xt_nat.c
xt_NETMAP.c
xt_nfacct.c
xt_NFLOG.c
xt_NFQUEUE.c	netfilter: xt_NFQUEUE: coalesce IPv4 and IPv6 hashing	2013-04-02 01:26:10 +02:00
xt_osf.c	netfilter: nf_log: prepare net namespace support for loggers	2013-04-05 20:12:54 +02:00
xt_owner.c
xt_physdev.c
xt_pkttype.c
xt_policy.c
xt_quota.c
xt_rateest.c
xt_RATEEST.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
xt_realm.c
xt_recent.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-02-26 20:16:07 -08:00
xt_REDIRECT.c
xt_repldata.h
xt_sctp.c
xt_SECMARK.c
xt_set.c	netfilter: ipset: set match: add support to match the counters	2013-04-29 20:09:03 +02:00
xt_socket.c
xt_state.c
xt_statistic.c
xt_string.c
xt_tcpmss.c
xt_TCPMSS.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
xt_TCPOPTSTRIP.c
xt_tcpudp.c
xt_TEE.c
xt_time.c
xt_TPROXY.c
xt_TRACE.c
xt_u32.c