David S. Miller 4a35ecf8bf Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

act_api.c

net_sched: make traffic control network namespace aware

2010-03-22 20:26:25 -07:00

act_gact.c

…

act_ipt.c

…

act_mirred.c

net: rename skb->iif to skb->skb_iif

2009-11-20 15:35:04 -08:00

act_nat.c

…

act_pedit.c

pkt_sched: pedit use proper struct

2009-10-11 23:03:47 -07:00

act_police.c

…

act_simple.c

…

act_skbedit.c

pkt_sched: skbedit add support for setting mark

2009-10-22 21:56:42 -07:00

cls_api.c

net_sched: make traffic control network namespace aware

2010-03-22 20:26:25 -07:00

cls_basic.c

…

cls_cgroup.c

cgroups: net_cls as module

2010-03-23 13:06:14 -07:00

cls_flow.c

net: rename skb->iif to skb->skb_iif

2009-11-20 15:35:04 -08:00

cls_fw.c

…

cls_route.c

…

cls_rsvp6.c

…

cls_rsvp.c

…

cls_rsvp.h

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

cls_tcindex.c

…

cls_u32.c

net: remove trailing space in messages

2010-03-24 14:01:54 -07:00

em_cmp.c

…

em_meta.c

netsched: Allow var_sk_bound_if meta to work on all namespaces

2009-11-18 23:24:41 -08:00

em_nbyte.c

…

em_text.c

…

em_u32.c

…

ematch.c

…

Kconfig

cgroups: net_cls as module

2010-03-23 13:06:14 -07:00

Makefile

net_sched: add classful multiqueue dummy scheduler

2009-09-06 02:07:05 -07:00

sch_api.c

net_sched: minor netns related cleanup

2010-03-30 19:44:56 -07:00

sch_atm.c

…

sch_blackhole.c

…

sch_cbq.c

pkt_sched: gen_estimator: Dont report fake rate estimators

2009-10-07 01:07:42 -07:00

sch_drr.c

pkt_sched: gen_estimator: Dont report fake rate estimators

2009-10-07 01:07:42 -07:00

sch_dsmark.c

…

sch_fifo.c

sched: add head drop fifo queue

2010-01-28 21:27:00 -08:00

sch_generic.c

gen_estimator: deadlock fix

2010-04-01 18:38:48 -07:00

sch_gred.c

…

sch_hfsc.c

pkt_sched: gen_estimator: Dont report fake rate estimators

2009-10-07 01:07:42 -07:00

sch_htb.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

sch_ingress.c

net_sched: make cls_ops->change and cls_ops->delete optional

2009-09-06 02:07:02 -07:00

sch_mq.c

pkt_sched: Fix qstats.qlen updating in dump_stats

2009-09-17 10:26:07 -07:00

sch_multiq.c

pkt_sched: Fix qstats.qlen updating in dump_stats

2009-09-17 10:26:07 -07:00

sch_netem.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00

sch_prio.c

pkt_sched: Fix qstats.qlen updating in dump_stats

2009-09-17 10:26:07 -07:00

sch_red.c

net_sched: remove some unnecessary checks in classful schedulers

2009-09-06 02:07:02 -07:00

sch_sfq.c

net_sched: make cls_ops->change and cls_ops->delete optional

2009-09-06 02:07:02 -07:00

sch_tbf.c

net_sched: remove some unnecessary checks in classful schedulers

2009-09-06 02:07:02 -07:00

sch_teql.c

net: Move && and || to end of previous line

2009-11-29 16:55:45 -08:00