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

Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-07-20 18:25:24 -07:00

..

act_api.c

pkt_sched: gen_kill_estimator() rcu fixes

2010-06-11 18:37:08 -07:00

act_gact.c

net sched: printk message severity

2010-05-17 23:23:12 -07:00

act_ipt.c

net sched: printk message severity

2010-05-17 23:23:12 -07:00

act_mirred.c

act_mirred: combine duplicate code

2010-06-30 12:12:36 -07:00

act_nat.c

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

2010-07-20 18:25:24 -07:00

act_pedit.c

net sched: make pedit check for clones instead

2010-06-07 01:10:43 -07:00

act_police.c

pkt_sched: gen_kill_estimator() rcu fixes

2010-06-11 18:37:08 -07:00

act_simple.c

net/sched: potential data corruption

2010-07-14 17:56:37 -07:00

act_skbedit.c

pkt_sched: skbedit add support for setting mark

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

cls_api.c

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

2010-04-11 14:53:53 -07:00

cls_basic.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

cls_cgroup.c

cls_cgroup: Store classid in struct sock

2010-05-24 00:12:34 -07:00

cls_flow.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

cls_fw.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

cls_route.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

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

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

cls_u32.c

cls_u32: use skb_header_pointer() to dereference data safely

2010-06-02 07:32:42 -07:00

em_cmp.c

…

em_meta.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

em_nbyte.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

em_text.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

em_u32.c

…

ematch.c

net sched: printk message severity

2010-05-17 23:23:12 -07:00

Kconfig

cgroups: net_cls as module

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

Makefile

…

sch_api.c

net_sched: Fix qdisc_notify()

2010-05-23 23:11:07 -07:00

sch_atm.c

sch_atm: Convert to use standard list_head facilities.

2010-07-18 19:52:55 -07:00

sch_blackhole.c

…

sch_cbq.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sch_drr.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sch_dsmark.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sch_fifo.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sch_generic.c

net: this_cpu_xxx conversions

2010-07-19 15:12:51 -07:00

sch_gred.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sch_hfsc.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

sch_htb.c

htb: remove two unnecessary assignments

2010-06-07 01:08:11 -07:00

sch_ingress.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

sch_mq.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

sch_multiq.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

sch_netem.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sch_prio.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

sch_red.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

sch_sfq.c

net: Fix various endianness glitches

2010-04-20 19:06:52 -07:00

sch_tbf.c

tbf: stop wanton destruction of children (v2)

2010-05-17 17:44:35 -07:00

sch_teql.c

Clear IFF_XMIT_DST_RELEASE for teql interfaces

2010-06-16 14:47:30 -07:00