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/11/08 15:27:28

Modified files:
	./: Makefile 
	2.3/Documentation/: Configure.help 
	2.3/arch/m68k/amiga/: chipram.c config.c 
	2.3/arch/ppc/: config.in 
	2.3/arch/ppc/amiga/: config.c 
	2.3/arch/ppc/kernel/: Makefile head.S ppc_ksyms.c setup.c 
	2.3/arch/ppc/mm/: init.c 
	2.3/drivers/net/: ariadne2.c 
	2.3/drivers/scsi/: Config.in 
	2.3/drivers/video/: amifb.c cyberfb.c fbmem.c retz3fb.c 
	                    virgefb.c 
	2.3/include/asm-ppc/: amigaints.h bootinfo.h io.h pgtable.h 
	2.3/mm/: page_alloc.c 

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