android_kernel_xiaomi_sm8350/net/sched
Arjan van de Ven 651dab4264 Merge commit 'linus/master' into merge-linus
Conflicts:

	arch/x86/kvm/i8254.c
2008-10-17 09:20:26 -07:00
..
act_api.c net-sched: fix Action flushing return code 2008-08-13 02:41:45 -07:00
act_gact.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
act_ipt.c netfilter: xtables: provide invoked family value to extensions 2008-10-08 11:35:20 +02:00
act_mirred.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
act_nat.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
act_pedit.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
act_police.c net: convert BUG_TRAP to generic WARN_ON 2008-07-25 21:43:18 -07:00
act_simple.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
act_skbedit.c pkt_action: add new action skbedit 2008-09-12 16:30:20 -07:00
cls_api.c pkt_sched: Fix locking of qdisc_root with qdisc_root_sleeping_lock() 2008-08-29 14:27:52 -07:00
cls_basic.c
cls_flow.c net: Use hton[sl]() instead of __constant_hton[sl]() where applicable 2008-09-20 22:20:49 -07:00
cls_fw.c
cls_route.c pkt_sched: Fix locking of qdisc_root with qdisc_root_sleeping_lock() 2008-08-29 14:27:52 -07:00
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h
cls_tcindex.c
cls_u32.c net: convert BUG_TRAP to generic WARN_ON 2008-07-25 21:43:18 -07:00
em_cmp.c net: em_cmp.c use unaligned access helpers 2008-09-22 19:20:51 -07:00
em_meta.c
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig pkt_action: add new action skbedit 2008-09-12 16:30:20 -07:00
Makefile pkt_action: add new action skbedit 2008-09-12 16:30:20 -07:00
sch_api.c pkt_sched: Fix locking of qdisc_root with qdisc_root_sleeping_lock() 2008-08-29 14:27:52 -07:00
sch_atm.c net_sched: Add qdisc __NET_XMIT_BYPASS flag 2008-08-04 22:39:11 -07:00
sch_blackhole.c
sch_cbq.c hrtimer: convert net::sched_cbq to the new hrtimer apis 2008-09-05 21:35:11 -07:00
sch_dsmark.c net: Use hton[sl]() instead of __constant_hton[sl]() where applicable 2008-09-20 22:20:49 -07:00
sch_fifo.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
sch_generic.c pkt_sched: Update qdisc requeue stats in dev_requeue_skb() 2008-10-08 11:36:22 -07:00
sch_gred.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
sch_hfsc.c pkt_sched: Fix gen_estimator locks 2008-08-27 02:25:17 -07:00
sch_htb.c pkt_sched: Fix locking of qdisc_root with qdisc_root_sleeping_lock() 2008-08-29 14:27:52 -07:00
sch_ingress.c net_sched: Add accessor function for packet length for qdiscs 2008-07-20 00:08:27 -07:00
sch_multiq.c multiq: requeue should rewind the current_band 2008-09-20 22:07:34 -07:00
sch_netem.c netlink: Remove compat API for nested attributes 2008-09-02 17:30:27 -07:00
sch_prio.c netlink: Remove compat API for nested attributes 2008-09-02 17:30:27 -07:00
sch_red.c net_sched: Add qdisc __NET_XMIT_STOLEN flag 2008-08-04 22:31:03 -07:00
sch_sfq.c net: Use hton[sl]() instead of __constant_hton[sl]() where applicable 2008-09-20 22:20:49 -07:00
sch_tbf.c pkt_sched: Fix return value corruption in HTB and TBF. 2008-08-18 00:39:41 -07:00
sch_teql.c pkt_sched: Fix locking of qdisc_root with qdisc_root_sleeping_lock() 2008-08-29 14:27:52 -07:00