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/23 16:18:03

Log message:
  conflict fixes from import bitkeeper (2.4.15)

Modified files:
      ./:
        Makefile 
      2.3/arch/ppc/:
        defconfig 
      2.3/arch/ppc/amiga/:
        config.c 
      2.3/arch/ppc/configs/:
        apus_defconfig 
      2.3/arch/ppc/kernel/:
        apus_setup.c ppc_ksyms.c setup.c 
      2.3/arch/ppc/mm/:
        ppc_mmu.c 
      2.3/drivers/char/:
        Makefile 
      2.3/drivers/scsi/:
        Config.in Makefile 
      2.3/drivers/video/:
        amifb.c fbmem.c virgefb.c 
      2.3/include/asm-ppc/:
        pgtable.h 
      2.3/include/linux/:
        parport.h 
      2.3/mm/:
        page_alloc.c 
Removed files:
      2.3/drivers/md/:
        lvm-snap.h 
      2.3/drivers/pcmcia/:
        cb_enabler.c old-yenta.h rsrc_mgr.h smc34c90.h 
      2.3/drivers/video/sis/:
        sis.h sis_300.c sis_300.h sis_301.c sis_301.h 
      2.3/include/asm-arm/arch-integrator/:
        sizes.h 
      2.3/include/asm-ia64/:
        ipc.h 
      2.3/include/asm-s390x/:
        s390-regs-common.h 
  
  Revision      Changes    Path
  1.30          +3 -2      2.3/Makefile
  1.17          +8 -0      2.3/arch/ppc/defconfig
  1.13          +1 -1      2.3/arch/ppc/amiga/config.c
  1.15          +8 -0      2.3/arch/ppc/configs/apus_defconfig
  1.32          +13 -16    2.3/arch/ppc/kernel/apus_setup.c
  1.29          +1 -1      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.22          +106 -129  2.3/arch/ppc/kernel/setup.c
  1.3           +3 -0      2.3/arch/ppc/mm/ppc_mmu.c
  1.18          +2 -0      2.3/drivers/char/Makefile
  1.11          +10 -1     2.3/drivers/scsi/Config.in
  1.7           +6 -0      2.3/drivers/scsi/Makefile
  1.13          +3 -1      2.3/drivers/video/amifb.c
  1.12          +3 -1      2.3/drivers/video/fbmem.c
  1.9           +4 -1      2.3/drivers/video/virgefb.c
  1.14          +6 -1      2.3/include/asm-ppc/pgtable.h
  1.4           +2 -2      2.3/include/linux/parport.h
  1.21          +23 -19    2.3/mm/page_alloc.c