CVS Update: 2.3

[Roman Z. <zi...@us...>]

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/mm/
Changes by:	zi...@sl....	00/08/25 19:08:16

Modified files:
	./: Makefile 
	2.3/arch/ppc/: config.in 
	2.3/arch/ppc/kernel/: apus_setup.c head.S ppc_ksyms.c setup.c 
	2.3/arch/ppc/mm/: init.c 
	2.3/drivers/char/: Makefile 
	2.3/drivers/sound/: Makefile 
	2.3/drivers/video/: cyberfb.c 
	2.3/include/asm-ppc/: pgtable.h 
	2.3/mm/: page_alloc.c 

Log message:
	conflicts fixed from import bitkeeper (2.4.0-test7)