CVS Update: 2.3 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/mm/
Changes by:	zippel@usw-pr-cvs1.	01/08/21 10:43:50

Log message:
  conflict fixes from import bitkeeper (2.4.9)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        Makefile defconfig 
      2.3/arch/ppc/configs/:
        apus_defconfig 
      2.3/arch/ppc/kernel/:
        apus_setup.c head.S pci.c ppc_ksyms.c setup.c time.c 
      2.3/arch/ppc/mm/:
        init.c pgtable.c 
      2.3/drivers/char/:
        mem.c ser_a2232.c 
      2.3/drivers/sound/dmasound/:
        dmasound.h dmasound_core.c dmasound_paula.c 
      2.3/fs/affs/:
        namei.c 
      2.3/fs/fat/:
        dir.c 
      2.3/include/asm-ppc/:
        bootinfo.h io.h page.h 
      2.3/mm/:
        page_alloc.c 
Removed files:
      2.3/Documentation/parisc/:
        mm 
      2.3/arch/arm/lib/:
        io-pcio.S 
      2.3/arch/arm/mach-sa1100/:
        arch.c hw.c 
      2.3/arch/arm/mm/:
        mm-sa1100.c 
      2.3/drivers/ide/:
        osb4.c 
      2.3/drivers/scsi/:
        qlogicfc_asm.c 
      2.3/drivers/sound/emu10k1/:
        joystick.c 
      2.3/include/asm-arm/arch-sa1100/:
        mmzone.h serial_reg.h 
  
  Revision      Changes    Path
  1.26          +1 -1      2.3/Makefile
  1.18          +57 -14    2.3/Documentation/Configure.help
  1.10          +2 -1      2.3/arch/ppc/Makefile
  1.13          +6 -0      2.3/arch/ppc/defconfig
  1.11          +6 -0      2.3/arch/ppc/configs/apus_defconfig
  1.21          +21 -11    2.3/arch/ppc/kernel/apus_setup.c
  1.22          +86 -51    2.3/arch/ppc/kernel/head.S
  1.14          +1 -1      2.3/arch/ppc/kernel/pci.c
  1.24          +13 -24    2.3/arch/ppc/kernel/ppc_ksyms.c
  1.17          +175 -336  2.3/arch/ppc/kernel/setup.c
  1.13          +23 -25    2.3/arch/ppc/kernel/time.c
  1.21          +103 -891  2.3/arch/ppc/mm/init.c
  1.2           +21 -2     2.3/arch/ppc/mm/pgtable.c
  1.9           +0 -6      2.3/drivers/char/mem.c
  1.4           +1 -1      2.3/drivers/char/ser_a2232.c
  1.3           +0 -1      2.3/drivers/sound/dmasound/dmasound.h
  1.4           +3 -3      2.3/drivers/sound/dmasound/dmasound_core.c
  1.3           +6 -6      2.3/drivers/sound/dmasound/dmasound_paula.c
  1.8           +10 -19    2.3/fs/affs/namei.c
  1.3           +1 -1      2.3/fs/fat/dir.c
  1.7           +2 -1      2.3/include/asm-ppc/bootinfo.h
  1.10          +7 -11     2.3/include/asm-ppc/io.h
  1.4           +2 -1      2.3/include/asm-ppc/page.h
  1.17          +1 -1      2.3/mm/page_alloc.c