David S. Miller 6ab33d5171 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c include/net/mac80211.h net/phonet/af_phonet.c		2008-11-20 16:44:00 -08:00
..
act_api.c	net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)	2008-10-16 15:24:51 -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: remove unnecessary xchg() in packet classifiers	2008-11-20 04:14:28 -08:00
cls_basic.c	pkt_sched: remove unnecessary xchg() in packet classifiers	2008-11-20 04:14:28 -08:00
cls_cgroup.c	pkt_sched: remove unnecessary xchg() in packet classifiers	2008-11-20 04:14:28 -08:00
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	pkt_sched: remove unnecessary xchg() in packet classifiers	2008-11-20 04:14:28 -08:00
cls_route.c	pkt_sched: remove unnecessary xchg() in packet classifiers	2008-11-20 04:14:28 -08:00
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h
cls_tcindex.c	pkt_sched: remove unnecessary xchg() in packet classifiers	2008-11-20 04:14:28 -08:00
cls_u32.c	pkt_sched: remove unnecessary xchg() in packet classifiers	2008-11-20 04:14:28 -08: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	ematch: simpler tcf_em_unregister()	2008-11-16 23:01:49 -08:00
Kconfig	pkt_sched: add DRR scheduler	2008-11-20 04:10:00 -08:00
Makefile	pkt_sched: add DRR scheduler	2008-11-20 04:10:00 -08:00
sch_api.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-20 16:44:00 -08:00
sch_atm.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_blackhole.c	pkt_sched: Add qdisc->ops->peek() implementation.	2008-10-31 00:45:55 -07:00
sch_cbq.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_drr.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_dsmark.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_fifo.c	pkt_sched: Remove qdisc->ops->requeue() etc.	2008-11-13 22:56:30 -08:00
sch_generic.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-20 16:44:00 -08:00
sch_gred.c	pkt_sched: Remove qdisc->ops->requeue() etc.	2008-11-13 22:56:30 -08:00
sch_hfsc.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_htb.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08: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	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_netem.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_prio.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_red.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_sfq.c	pkt_sched: Remove qdisc->ops->requeue() etc.	2008-11-13 22:56:30 -08:00
sch_tbf.c	pkt_sched: remove unnecessary xchg() in packet schedulers	2008-11-20 04:11:36 -08:00
sch_teql.c	pkt_sched: Remove qdisc->ops->requeue() etc.	2008-11-13 22:56:30 -08:00