CVS Update: 2.3

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/include/asm-ppc/
Changes by:	zi...@sl....	00/11/26 07:50:12

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/drivers/scsi/: a2091.c a3000.c 
	2.3/fs/affs/: inode.c symlink.c 
	2.3/include/asm-ppc/: io.h 

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