David S. Miller 87ffabb1f0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The dwmac-socfpga.c conflict was a case of a bug fix overlapping changes in net-next to handle an error pointer differently. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-14 15:44:14 -04:00
..
act_api.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
act_bpf.c	act_bpf: add initial eBPF support for actions	2015-03-20 19:10:44 -04:00
act_connmark.c	net: sched: Introduce connmark action	2015-01-19 16:02:06 -05:00
act_csum.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
act_gact.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_ipt.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_mirred.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_nat.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_pedit.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_police.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_simple.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_skbedit.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_vlan.c	sched: introduce vlan action	2014-11-21 14:20:18 -05:00
cls_api.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_basic.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_bpf.c	cls_bpf: do eBPF invocation under non-bh RCU lock variant for maps	2015-03-12 18:33:15 -04:00
cls_cgroup.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_flow.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_fw.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_route.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_rsvp6.c	[NET_SCHED]: Remove unnecessary includes	2007-07-10 22:16:41 -07:00
cls_rsvp.c	[NET_SCHED]: Remove unnecessary includes	2007-07-10 22:16:41 -07:00
cls_rsvp.h	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_tcindex.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
cls_u32.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
em_canid.c	net: sched: remove tcf_proto from ematch calls	2014-10-06 18:02:32 -04:00
em_cmp.c	net_sched: cleanups	2011-01-19 23:31:12 -08:00
em_ipset.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
em_meta.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
em_nbyte.c	net: sched: remove tcf_proto from ematch calls	2014-10-06 18:02:32 -04:00
em_text.c	net: Remove state argument from skb_find_text()	2015-02-22 15:59:54 -05:00
em_u32.c	net_sched: cleanups	2011-01-19 23:31:12 -08:00
ematch.c	ematch: Fix auto-loading of ematch modules.	2015-02-20 15:30:56 -05:00
Kconfig	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-02-19 10:36:45 -08:00
Makefile	net: sched: Introduce connmark action	2015-01-19 16:02:06 -05:00
sch_api.c	net_sched: destroy proto tp when all filters are gone	2015-03-09 15:35:55 -04:00
sch_atm.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_blackhole.c	pkt_sched: Add qdisc->ops->peek() implementation.	2008-10-31 00:45:55 -07:00
sch_cbq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_choke.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_codel.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_drr.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_dsmark.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
sch_fifo.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_fq_codel.c	net: fix suspicious rcu_dereference_check in net/sched/sch_fq_codel.c	2014-12-09 21:49:09 -05:00
sch_fq.c	pkt_sched: fq: correct spelling of locally	2015-04-01 22:52:29 -04:00
sch_generic.c	net_sched: restore qdisc quota fairness limits after bulk dequeue	2014-10-09 19:12:26 -04:00
sch_gred.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_hfsc.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_hhf.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_htb.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_ingress.c	net: use jump label patching for ingress qdisc in __netif_receive_skb_core	2015-04-13 13:34:40 -04:00
sch_mq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_mqprio.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_multiq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_netem.c	netem: Fixes byte backlog accounting for the first of two chained netem instances	2015-04-07 18:34:24 -04:00
sch_pie.c	sch_pie: schedule the timer after all init succeed	2014-10-29 14:28:01 -04:00
sch_plug.c	net_sched: sch_plug: plug_qdisc_ops is static	2012-02-13 16:04:40 -05:00
sch_prio.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_qfq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_red.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_sfb.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_sfq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_tbf.c	net: sched: avoid costly atomic operation in fq_dequeue()	2014-10-06 00:55:10 -04:00
sch_teql.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00