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/10/12 15:10:18

Modified files:
	./: Makefile 
	2.3/Documentation/: Configure.help 
	2.3/arch/m68k/: config.in 
	2.3/arch/ppc/: config.in 
	2.3/arch/ppc/kernel/: apus_setup.c head.S ppc-stub.c ppc_ksyms.c 
	                      time.c 
	2.3/arch/ppc/mm/: init.c 
	2.3/drivers/char/: Makefile 
	2.3/drivers/scsi/: Config.in a2091.c a3000.c blz1230.c blz2060.c 
	                   cyberstorm.c cyberstormII.c fastlane.c 
	                   gvp11.c oktagon_esp.c 
	2.3/mm/: page_alloc.c 

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