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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-tx.c
	net/8021q/vlan_core.c
	net/core/dev.c

2009-03-01 21:35:16 -08:00

..

act_api.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08:00

act_gact.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08:00

act_ipt.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08:00

act_mirred.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08:00

act_nat.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08:00

act_pedit.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08:00

act_police.c

pkt_sched: gen_estimator: Optimize gen_estimator_active()

2008-11-26 15:24:32 -08:00

act_simple.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08:00

act_skbedit.c

tc: propogate errors from tcf_hash_create

2008-11-25 21:13:25 -08: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

cls_cgroup: clean up for cgroup part

2008-12-29 19:40:45 -08:00

cls_flow.c

CRED: Use creds in file structs

2008-11-14 10:39:25 +11: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

[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]: Use nla_policy for attribute validation in classifiers

2008-01-28 15:11:23 -08:00

cls_tcindex.c

pkt_sched: remove unnecessary xchg() in packet classifiers

2008-11-20 04:14:28 -08:00

cls_u32.c

pkt_sched: cls_u32: Fix locking in u32_change()

2009-01-05 18:14:19 -08:00

em_cmp.c

net: em_cmp.c use unaligned access helpers

2008-09-22 19:20:51 -07:00

em_meta.c

[IPV4]: Add 'rtable' field in struct sk_buff to alias 'dst' and avoid casts

2008-03-05 18:30:47 -08:00

em_nbyte.c

[NET_SCHED]: ematch: module autoloading

2007-07-11 19:46:26 -07:00

em_text.c

[NET_SCHED]: Convert classifiers from rtnetlink to new netlink API

2008-01-28 15:11:11 -08:00

em_u32.c

[PKT_SCHED]: annotate cls_u32

2008-03-17 22:46:46 -07:00

ematch.c

ematch: simpler tcf_em_unregister()

2008-11-16 23:01:49 -08:00

Kconfig

cls_cgroup: clean up Kconfig

2008-12-29 19:40:46 -08:00

Makefile

pkt_sched: add DRR scheduler

2008-11-20 04:10:00 -08:00

sch_api.c

pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving warning handler.

2009-02-01 01:12:42 -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

tc: check for errors in gen_rate_estimator creation

2008-11-25 21:13:31 -08:00

sch_drr.c

pkt_sched: sch_drr: Fix oops in drr_change_class.

2009-02-27 02:42:38 -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

Revert "net: Fix for initial link state in 2.6.28"

2009-01-05 16:01:51 -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: sch_hfsc: sch_htb: Add non-work-conserving warning handler.

2009-02-01 01:12:42 -08:00

sch_htb.c

pkt_sched: sch_htb: Use workqueue to schedule after too many events.

2009-02-01 01:13:22 -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: sch_multiq: Change errno on non-multiqueue devices use.

2009-02-10 00:11:21 -08:00

sch_netem.c

pkt_sched: Remove smp_wmb() in qdisc_watchdog()

2008-12-22 19:44:13 -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

remove lots of double-semicolons

2009-01-08 08:31:14 -08:00

sch_tbf.c

pkt_sched: remove unnecessary xchg() in packet schedulers

2008-11-20 04:11:36 -08:00

sch_teql.c

sch_teql: convert to net_device_ops

2009-01-06 10:45:57 -08:00