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/04/02 15:55:20

Log message:
  conflict fixes from import bitkeeper (2.4.3)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        Makefile config.in 
      2.3/arch/ppc/kernel/:
        Makefile apus_setup.c head.S irq.c pci.c ppc_ksyms.c 
        setup.c 
      2.3/arch/ppc/mm/:
        init.c 
      2.3/drivers/char/:
        Makefile 
      2.3/drivers/net/:
        Makefile 
      2.3/drivers/scsi/:
        Config.in Makefile 
      2.3/drivers/video/:
        fbmem.c 
      2.3/fs/affs/:
        super.c 
      2.3/include/linux/:
        irq.h 
      2.3/mm/:
        page_alloc.c 
Added files:
      2.3/arch/alpha/:
        vmlinux.lds 
      2.3/arch/m68k/kernel/:
        m68k_defs.h 
      2.3/arch/ppc/kernel/:
        gemini_pci.c gemini_prom.S gemini_setup.c 
      2.3/arch/ppc/mbxboot/:
        vmlinux.lds 
      2.3/drivers/acpi/include/:
        config.h 
      2.3/include/asm-ppc/:
        gemini.h gemini_serial.h 
Removed files:
      2.3/arch/arm/lib/:
        extractconstants.pl getconsdata.c 
      2.3/drivers/char/pcmcia/:
        serial_cb.c 
      2.3/drivers/isdn/:
        isdn_cards.c isdn_cards.h 
      2.3/drivers/isdn/eicon/:
        fcheck.c md5sums.asc 
      2.3/drivers/net/:
        rtl8129.c 
      2.3/drivers/net/wan/:
        syncppp.h 
      2.3/drivers/scsi/:
        README.aic7xxx aic7xxx.c aic7xxx.h aic7xxx_proc.c 
        aic7xxx_reg.h aic7xxx_seq.c 
      2.3/drivers/scsi/aic7xxx/:
        sequencer.h 
      2.3/drivers/scsi/pcmcia/:
        apa1480_stub.c 
      2.3/include/asm-i386/:
        pgalloc-2level.h pgalloc-3level.h 
      2.3/include/asm-ppc/:
        tqm860.h tqm8xxL.h 
  
  Revision      Changes    Path
  1.19          +5 -4      2.3/Makefile
  1.11          +216 -52   2.3/Documentation/Configure.help
  1.4           +4 -1      2.3/arch/ppc/Makefile
  1.20          +18 -6     2.3/arch/ppc/config.in
  1.9           +8 -7      2.3/arch/ppc/kernel/Makefile
  1.13          +60 -13    2.3/arch/ppc/kernel/apus_setup.c
  1.16          +27 -2     2.3/arch/ppc/kernel/head.S
  1.5           +354 -116  2.3/arch/ppc/kernel/irq.c
  1.7           +109 -1    2.3/arch/ppc/kernel/pci.c
  1.17          +21 -1     2.3/arch/ppc/kernel/ppc_ksyms.c
  1.12          +11 -7     2.3/arch/ppc/kernel/setup.c
  1.15          +45 -287   2.3/arch/ppc/mm/init.c
  1.10          +2 -0      2.3/drivers/char/Makefile
  1.5           +5 -3      2.3/drivers/net/Makefile
  1.7           +8 -6      2.3/drivers/scsi/Config.in
  1.4           +13 -8     2.3/drivers/scsi/Makefile
  1.8           +52 -3     2.3/drivers/video/fbmem.c
  1.5           +6 -0      2.3/fs/affs/super.c
  1.2           +2 -1      2.3/include/linux/irq.h
  1.12          +1 -2      2.3/mm/page_alloc.c