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/10/25 15:02:41

Log message:
  conflict fixes from import bitkeeper (2.4.13)

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 ppc_ksyms.c setup.c 
      2.3/drivers/char/:
        Makefile 
      2.3/drivers/net/:
        Makefile hydra.c 
      2.3/drivers/scsi/:
        Config.in 
      2.3/drivers/video/:
        Config.in virgefb.c 
      2.3/include/asm-ppc/:
        io.h mpc8xx.h 
      2.3/mm/:
        page_alloc.c 
Removed files:
      2.3/Documentation/video4linux/:
        README.buz 
      2.3/arch/arm/boot/compressed/:
        setup-sa1100.S 
      2.3/arch/arm/mach-sa1100/:
        bitsy.c 
      2.3/arch/arm/mm/:
        mm-nexuspci.c 
      2.3/arch/s390/kernel/:
        lowcore.S 
      2.3/arch/s390x/kernel/:
        lowcore.S mathemu.c 
      2.3/drivers/i2o/:
        Config.in Makefile README README.ioctl i2o_block.c 
        i2o_config.c i2o_core.c i2o_lan.c i2o_lan.h i2o_pci.c 
        i2o_proc.c i2o_scsi.c i2o_scsi.h 
      2.3/fs/fat/:
        msbuffer.h 
      2.3/include/asm-arm/arch-sa1100/:
        bitsy.h 
      2.3/include/asm-s390x/:
        mathemu.h 
  
  Revision      Changes    Path
  1.28          +3 -2      2.3/Makefile
  1.20          +240 -34   2.3/Documentation/Configure.help
  1.12          +1 -1      2.3/arch/ppc/Makefile
  1.15          +99 -4     2.3/arch/ppc/defconfig
  1.13          +99 -4     2.3/arch/ppc/configs/apus_defconfig
  1.25          +1 -5      2.3/arch/ppc/kernel/apus_setup.c
  1.24          +3 -3      2.3/arch/ppc/kernel/head.S
  1.27          +2 -2      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.19          +2 -2      2.3/arch/ppc/kernel/setup.c
  1.16          +6 -0      2.3/drivers/char/Makefile
  1.11          +1 -0      2.3/drivers/net/Makefile
  1.4           +1 -0      2.3/drivers/net/hydra.c
  1.10          +3 -2      2.3/drivers/scsi/Config.in
  1.7           +5 -15     2.3/drivers/video/Config.in
  1.8           +1 -1      2.3/drivers/video/virgefb.c
  1.12          +4 -5      2.3/include/asm-ppc/io.h
  1.5           +3 -3      2.3/include/asm-ppc/mpc8xx.h
  1.19          +20 -19    2.3/mm/page_alloc.c