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/11/06 17:42:39

Log message:
  conflict fixes from import bitkeeper (2.4.14)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        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/ide/:
        buddha.c ide.c 
      2.3/drivers/parport/:
        ieee1284.c ieee1284_ops.c 
      2.3/drivers/scsi/:
        amiga7xx.c fastlane.c 
      2.3/drivers/sound/dmasound/:
        dmasound_core.c dmasound_paula.c 
      2.3/include/asm-ppc/:
        io.h mpc8xx.h pgtable.h 
      2.3/mm/:
        page_alloc.c 
Removed files:
      2.3/arch/arm/def-configs/:
        bitsy cerf 
      2.3/drivers/acpi/:
        driver.h 
      2.3/drivers/acpi/executer/:
        exdyadic.c exmonad.c exxface.c 
      2.3/fs/cramfs/inflate/:
        Makefile adler32.c infblock.c infblock.h infcodes.c 
        infcodes.h inffast.c inffast.h inffixed.h inflate.c 
        inftrees.c inftrees.h infutil.c infutil.h uncompr.c 
        zconf.h zlib.h zutil.h 
  
  Revision      Changes    Path
  1.29          +1 -1      2.3/Makefile
  1.21          +121 -1    2.3/Documentation/Configure.help
  1.16          +9 -2      2.3/arch/ppc/defconfig
  1.14          +9 -2      2.3/arch/ppc/configs/apus_defconfig
  1.28          +1 -1      2.3/arch/ppc/kernel/apus_setup.c
  1.25          +1 -1      2.3/arch/ppc/kernel/head.S
  1.28          +3 -1      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.21          +1 -1      2.3/arch/ppc/kernel/setup.c
  1.17          +1 -0      2.3/drivers/char/Makefile
  1.7           +18 -11    2.3/drivers/ide/buddha.c
  1.5           +3 -9      2.3/drivers/ide/ide.c
  1.4           +5 -3      2.3/drivers/parport/ieee1284.c
  1.4           +8 -9      2.3/drivers/parport/ieee1284_ops.c
  1.4           +4 -1      2.3/drivers/scsi/amiga7xx.c
  1.8           +1 -1      2.3/drivers/scsi/fastlane.c
  1.5           +1 -0      2.3/drivers/sound/dmasound/dmasound_core.c
  1.5           +1 -0      2.3/drivers/sound/dmasound/dmasound_paula.c
  1.13          +1 -1      2.3/include/asm-ppc/io.h
  1.6           +1 -1      2.3/include/asm-ppc/mpc8xx.h
  1.13          +1 -1      2.3/include/asm-ppc/pgtable.h
  1.20          +18 -22    2.3/mm/page_alloc.c