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.	02/03/22 13:31:37

Log message:
  conflict fixes from import bitkeeper (2.4.18)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        config.in 
      2.3/arch/ppc/kernel/:
        head.S irq.c ppc_ksyms.c setup.c time.c 
      2.3/arch/ppc/mm/:
        init.c mmu_decl.h pgtable.c ppc_mmu.c 
      2.3/drivers/char/:
        Config.in Makefile 
      2.3/drivers/net/:
        Makefile 
      2.3/drivers/parport/:
        share.c 
      2.3/drivers/scsi/:
        Makefile 
      2.3/drivers/video/:
        Config.in fbmem.c 
      2.3/include/asm-ppc/:
        pgtable.h 
      2.3/mm/:
        page_alloc.c 
Removed files:
      2.3/arch/ppc/boot/common/:
        no_initrd.c 
      2.3/arch/ppc/boot/mbx/:
        Makefile embed_config.c gzimage.c head.S head_8260.S 
        iic.c m8260_tty.c m8xx_tty.c misc.c pci.c qspan_pci.c 
        rdimage.c 
      2.3/arch/ppc/boot/pmac/:
        dummy.c ld.script 
      2.3/arch/ppc/boot/tree/:
        Makefile irSect.c irSect.h ld.script main.c misc.S 
      2.3/arch/ppc/boot/utils/:
        mkevimg mkirimg mksimage.c offset piggyback.c sioffset 
        sisize size 
      2.3/drivers/sound/cs4281/:
        cs4281_wrapper-24.c 
      2.3/include/asm-s390/:
        s390-gdbregs.h 
      2.3/include/asm-s390x/:
        s390-gdbregs.h 
  
  Revision      Changes    Path
  1.33          +13 -10    2.3/Makefile
  1.23          +242 -94   2.3/Documentation/Configure.help
  1.32          +5 -1      2.3/arch/ppc/config.in
  1.27          +1 -1      2.3/arch/ppc/kernel/head.S
  1.15          +1 -1      2.3/arch/ppc/kernel/irq.c
  1.31          +2 -1      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.24          +3 -3      2.3/arch/ppc/kernel/setup.c
  1.18          +1 -3      2.3/arch/ppc/kernel/time.c
  1.26          +5 -14     2.3/arch/ppc/mm/init.c
  1.4           +2 -1      2.3/arch/ppc/mm/mmu_decl.h
  1.5           +73 -5     2.3/arch/ppc/mm/pgtable.c
  1.4           +6 -27     2.3/arch/ppc/mm/ppc_mmu.c
  1.7           +12 -1     2.3/drivers/char/Config.in
  1.20          +3 -2      2.3/drivers/char/Makefile
  1.13          +12 -12    2.3/drivers/net/Makefile
  1.5           +6 -2      2.3/drivers/parport/share.c
  1.9           +1 -1      2.3/drivers/scsi/Makefile
  1.8           +3 -2      2.3/drivers/video/Config.in
  1.14          +6 -0      2.3/drivers/video/fbmem.c
  1.15          +2 -11     2.3/include/asm-ppc/pgtable.h
  1.22          +6 -9      2.3/mm/page_alloc.c