Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/core/pktgen.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/sched/sch_cbq.c
Simple merge

diff --cc net/sched/sch_fifo.c
Simple merge

diff --cc net/sched/sch_generic.c
Simple merge

diff --cc net/sched/sch_gred.c
Simple merge

diff --cc net/sched/sch_htb.c
Simple merge

diff --cc net/sched/sch_netem.c
Simple merge

diff --cc net/sched/sch_prio.c
Simple merge

diff --cc net/sched/sch_red.c
Simple merge

diff --cc net/sched/sch_sfq.c
Simple merge

diff --cc net/sched/sch_tbf.c
Simple merge

diff --cc net/sched/sch_teql.c
Simple merge