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/09/13 12:44:43

Modified files:
	./: Makefile 
	2.3/arch/ppc/: config.in 
	2.3/arch/ppc/kernel/: Makefile head.S ppc_ksyms.c setup.c 
	2.3/arch/ppc/mm/: init.c 
	2.3/fs/affs/: bitmap.c file.c inode.c super.c 
	2.3/include/asm-ppc/: io.h 
	2.3/mm/: page_alloc.c 

Log message:
	conflict fixes from import bitkeeper (2.4.0-test8)