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/17 15:56:15

Log message:
  conflict fixes from import bitkeeper (2.4.12)

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_pci.c apus_setup.c head.S irq.c ppc_ksyms.c setup.c 
        time.c 
      2.3/arch/ppc/mm/:
        init.c pgtable.c 
      2.3/drivers/char/:
        Makefile mem.c ser_a2232.c 
      2.3/drivers/ide/:
        Config.in buddha.c 
      2.3/drivers/net/:
        Makefile 
      2.3/drivers/scsi/:
        Config.in Makefile NCR53C9x.h 
      2.3/drivers/sound/dmasound/:
        dmasound_paula.c 
      2.3/drivers/video/:
        Config.in amifb.c fbmem.c pm2fb.c virgefb.c 
      2.3/fs/partitions/:
        mac.c 
      2.3/include/asm-ppc/:
        bootinfo.h io.h page.h pgtable.h 
      2.3/include/linux/:
        irq.h 
      2.3/mm/:
        page_alloc.c 
Added files:
      2.3/arch/ppc/8xx_io/:
        micropatch.c 
      2.3/arch/ppc/kernel/:
        temp.c 
      2.3/drivers/acpi/namespace/:
        nsdump.c 
      2.3/drivers/scsi/:
        qlogicfc_asm.c 
      2.3/include/linux/:
        compiler.h 
Removed files:
      2.3/arch/mips/:
        defconfig-cobalt defconfig-orion 
      2.3/arch/mips/boot/:
        mkboot.c 
      2.3/arch/mips/dec/:
        serial.c 
      2.3/arch/mips/kernel/:
        fpe.c softfp.S 
      2.3/arch/mips/sgi/kernel/:
        indy_timer.c promcon.c 
      2.3/arch/mips/sni/:
        dma.c 
      2.3/arch/ppc/8xx_io/:
        commproc.h 
      2.3/arch/sh/mm/:
        cache.c 
      2.3/drivers/acpi/parser/:
        psfind.c 
      2.3/drivers/bluetooth/:
        hci_emu.c 
      2.3/drivers/char/:
        vino.h 
      2.3/drivers/ide/:
        amd7409.c qd6580.c 
      2.3/drivers/mtd/chips/:
        cfi_jedec.c 
      2.3/drivers/net/:
        ncr885_debug.h ncr885e.c ncr885e.h 
      2.3/drivers/sgi/char/:
        graphics_syms.c 
      2.3/drivers/tc/:
        tcsyms.c 
      2.3/drivers/usb/:
        hid.c net1080.c plusb.c 
      2.3/include/asm-ppc/:
        init.h 
      2.3/include/asm-sparc64/:
        vaddrs.h 
      2.3/include/net/bluetooth/:
        hci_emu.h 
      2.3/mm/:
        mmap_avl.c 
  
  Revision      Changes    Path
  1.27          +42 -9     2.3/Makefile
  1.19          +436 -61   2.3/Documentation/Configure.help
  1.11          +4 -1      2.3/arch/ppc/Makefile
  1.14          +40 -11    2.3/arch/ppc/defconfig
  1.12          +40 -11    2.3/arch/ppc/configs/apus_defconfig
  1.8           +5 -3      2.3/arch/ppc/kernel/apus_pci.c
  1.24          +1 -106    2.3/arch/ppc/kernel/apus_setup.c
  1.23          +1 -1      2.3/arch/ppc/kernel/head.S
  1.11          +14 -7     2.3/arch/ppc/kernel/irq.c
  1.26          +6 -4      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.18          +20 -31    2.3/arch/ppc/kernel/setup.c
  1.14          +4 -4      2.3/arch/ppc/kernel/time.c
  1.22          +4 -1      2.3/arch/ppc/mm/init.c
  1.3           +3 -3      2.3/arch/ppc/mm/pgtable.c
  1.15          +22 -15    2.3/drivers/char/Makefile
  1.10          +1 -3      2.3/drivers/char/mem.c
  1.5           +4 -0      2.3/drivers/char/ser_a2232.c
  1.5           +17 -2     2.3/drivers/ide/Config.in
  1.6           +2 -2      2.3/drivers/ide/buddha.c
  1.10          +10 -9     2.3/drivers/net/Makefile
  1.9           +19 -2     2.3/drivers/scsi/Config.in
  1.6           +30 -24    2.3/drivers/scsi/Makefile
  1.4           +3 -3      2.3/drivers/scsi/NCR53C9x.h
  1.4           +6 -6      2.3/drivers/sound/dmasound/dmasound_paula.c
  1.6           +73 -24    2.3/drivers/video/Config.in
  1.11          +3 -1      2.3/drivers/video/amifb.c
  1.11          +6 -2      2.3/drivers/video/fbmem.c
  1.6           +2 -0      2.3/drivers/video/pm2fb.c
  1.7           +2 -0      2.3/drivers/video/virgefb.c
  1.4           +24 -37    2.3/fs/partitions/mac.c
  1.8           +1 -1      2.3/include/asm-ppc/bootinfo.h
  1.11          +19 -8     2.3/include/asm-ppc/io.h
  1.5           +1 -1      2.3/include/asm-ppc/page.h
  1.11          +31 -7     2.3/include/asm-ppc/pgtable.h
  1.4           +14 -0     2.3/include/linux/irq.h
  1.18          +212 -327  2.3/mm/page_alloc.c