David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
act_api.c	net_sched: act: clean up tca_action_flush()	2014-02-12 19:23:32 -05:00
act_csum.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_gact.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_ipt.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_mirred.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -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	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_police.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_simple.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_skbedit.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
cls_api.c	net_sched: add struct net pointer to tcf_proto_ops->dump	2014-01-13 11:50:14 -08:00
cls_basic.c	net_sched: avoid casting void pointer	2014-01-13 11:50:15 -08:00
cls_bpf.c	net_sched: add struct net pointer to tcf_proto_ops->dump	2014-01-13 11:50:14 -08:00
cls_cgroup.c	net_sched: add struct net pointer to tcf_proto_ops->dump	2014-01-13 11:50:14 -08:00
cls_flow.c	net_sched: add struct net pointer to tcf_proto_ops->dump	2014-01-13 11:50:14 -08:00
cls_fw.c	net_sched: fix error return code in fw_change_attrs()	2014-01-16 19:12:03 -08:00
cls_route.c	net_sched: avoid casting void pointer	2014-01-13 11:50:15 -08:00
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h	net_sched: add struct net pointer to tcf_proto_ops->dump	2014-01-13 11:50:14 -08:00
cls_tcindex.c	net_sched: avoid casting void pointer	2014-01-13 11:50:15 -08:00
cls_u32.c	net_sched: avoid casting void pointer	2014-01-13 11:50:15 -08:00
em_canid.c
em_cmp.c
em_ipset.c
em_meta.c
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig
Makefile
sch_api.c
sch_atm.c
sch_blackhole.c
sch_cbq.c
sch_choke.c	random32: add prandom_u32_max and convert open coded users	2014-01-21 23:17:20 -08:00
sch_codel.c
sch_drr.c
sch_dsmark.c
sch_fifo.c
sch_fq_codel.c	net: replace macros net_random and net_srandom with direct calls to prandom	2014-01-14 15:15:25 -08:00
sch_fq.c
sch_generic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-14 14:42:42 -08:00
sch_gred.c
sch_hfsc.c
sch_hhf.c	net: replace macros net_random and net_srandom with direct calls to prandom	2014-01-14 15:15:25 -08:00
sch_htb.c	sch_htb: let skb->priority refer to non-leaf class	2014-01-22 17:39:48 -08:00
sch_ingress.c
sch_mq.c
sch_mqprio.c
sch_multiq.c
sch_netem.c	sch_netem: replace magic numbers with enumerate in get_loss_clg	2014-02-17 16:55:54 -05:00
sch_pie.c	net: sched: Cleanup PIE comments	2014-02-13 18:29:58 -05:00
sch_plug.c
sch_prio.c
sch_qfq.c
sch_red.c
sch_sfb.c	net: replace macros net_random and net_srandom with direct calls to prandom	2014-01-14 15:15:25 -08:00
sch_sfq.c	net: replace macros net_random and net_srandom with direct calls to prandom	2014-01-14 15:15:25 -08:00
sch_tbf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
sch_teql.c