David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
act_api.c	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
act_csum.c	act_csum: fix possible use after free	2013-04-12 15:25:41 -04:00
act_gact.c
act_ipt.c	net_sched: act_ipt forward compat with xtables	2013-05-01 13:19:19 -04:00
act_mirred.c	net: pass info struct via netdevice notifier	2013-05-28 13:11:01 -07:00
act_nat.c
act_pedit.c
act_police.c	net_sched: add u64 rate to psched_ratecfg_precompute()	2013-09-20 14:41:02 -04:00
act_simple.c
act_skbedit.c
cls_api.c	net_cls: remove duplicated include from cls_api.c	2013-04-07 17:12:01 -04:00
cls_basic.c	qdisc: basic classifier - remove unnecessary initialization	2013-09-30 15:47:43 -04:00
cls_cgroup.c	cgroup: make cgroup_taskset deal with cgroup_subsys_state instead of cgroup	2013-08-08 20:11:27 -04:00
cls_flow.c	netlink: rename ssk to sk in struct netlink_skb_params	2013-04-19 14:57:56 -04:00
cls_fw.c	pkt_sched: fix error return code in fw_change_attrs()	2013-04-19 17:34:53 -04:00
cls_route.c
cls_rsvp.c
cls_rsvp.h
cls_rsvp6.c
cls_tcindex.c
cls_u32.c
em_canid.c
em_cmp.c
em_ipset.c	netfilter: ipset: Introduce extensions to elements in the core	2013-04-29 20:08:54 +02:00
em_meta.c	qdisc: meta return ENOMEM on alloc failure	2013-09-30 15:47:43 -04:00
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig	pkt_sched: fq: Fair Queue packet scheduler	2013-08-29 21:38:31 -04:00
Makefile	pkt_sched: fq: Fair Queue packet scheduler	2013-08-29 21:38:31 -04:00
sch_api.c	qdisc: fix build with !CONFIG_NET_SCHED	2013-08-31 18:09:45 -04:00
sch_atm.c	net_sched: info leak in atm_tc_dump_class()	2013-07-31 15:04:19 -07:00
sch_blackhole.c
sch_cbq.c	net_sched: Fix stack info leak in cbq_dump_wrr().	2013-07-30 00:16:21 -07:00
sch_choke.c	treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks	2013-08-20 13:06:40 +02:00
sch_codel.c
sch_drr.c	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
sch_dsmark.c
sch_fifo.c
sch_fq.c	pkt_sched: fq: rate limiting improvements	2013-10-01 13:00:38 -04:00
sch_fq_codel.c	net: fq_codel: Fix off-by-one error	2013-03-29 15:32:23 -04:00
sch_generic.c	net_sched: add u64 rate to psched_ratecfg_precompute()	2013-09-20 14:41:02 -04:00
sch_gred.c
sch_hfsc.c	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
sch_htb.c	net_sched: htb: support of 64bit rates	2013-09-20 14:41:03 -04:00
sch_ingress.c
sch_mq.c	qdisc: allow setting default queuing discipline	2013-08-31 00:32:32 -04:00
sch_mqprio.c	qdisc: allow setting default queuing discipline	2013-08-31 00:32:32 -04:00
sch_multiq.c
sch_netem.c	netem: Introduce skb_orphan_partial() helper	2013-07-31 14:59:49 -07:00
sch_plug.c
sch_prio.c
sch_qfq.c	pkt_sched: sch_qfq: remove a source of high packet delay/jitter	2013-07-18 13:02:00 -07:00
sch_red.c
sch_sfb.c
sch_sfq.c
sch_tbf.c	net_sched: add u64 rate to psched_ratecfg_precompute()	2013-09-20 14:41:02 -04:00
sch_teql.c