git.hungrycats.org Git - linux/commit

]> git.hungrycats.org Git - linux/commit

projects / linux / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 25cc76c df1f9e2)

author	Linus Torvalds <torvalds@ppc970.osdl.org>
	Wed, 20 Oct 2004 03:00:37 +0000 (20:00 -0700)
committer	Linus Torvalds <torvalds@ppc970.osdl.org>
	Wed, 20 Oct 2004 03:00:37 +0000 (20:00 -0700)
commit	383fd49ea83dbaa484da6ff2955235a2a9d69af2
tree	dc33c203cbf1fe23a7fe62bd3a0fa6abdbffdbac	tree \| snapshot
parent	25cc76cf489ccab59c62685879f79143ead4b073	commit \| diff
parent	df1f9e22180fd581cf3ed64c7bfabb68ba92954a	commit \| diff

Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

14 files changed:

include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_cbq.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_fifo.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_generic.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_gred.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_htb.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_prio.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_red.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_sfq.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_tbf.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_teql.c	diff1 \|	diff2 \|	blob \| history

Linux kernels and configurations used by Zygo.