Merge suse.cz:/home/perex/bk/linux-sound/linux-2.5

author Jaroslav Kysela <perex@suse.cz>

Thu, 26 Aug 2004 18:12:16 +0000 (20:12 +0200)

committer Jaroslav Kysela <perex@suse.cz>

Thu, 26 Aug 2004 18:12:16 +0000 (20:12 +0200)
author Jaroslav Kysela <perex@suse.cz>
Thu, 26 Aug 2004 18:12:16 +0000 (20:12 +0200)
committer Jaroslav Kysela <perex@suse.cz>
Thu, 26 Aug 2004 18:12:16 +0000 (20:12 +0200)
diff --cc include/linux/slab.h
Simple merge
diff --cc mm/slab.c
Simple merge
author	Jaroslav Kysela <perex@suse.cz>
	Thu, 26 Aug 2004 18:12:16 +0000 (20:12 +0200)
committer	Jaroslav Kysela <perex@suse.cz>
	Thu, 26 Aug 2004 18:12:16 +0000 (20:12 +0200)
		1	2
include/linux/slab.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slab.c	patch \|	diff1 \|	diff2 \|	blob \| history