CVS Update: 2.3 (branch: trunk)

[Roman Z. <zi...@us...>]

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/mm/
Changes by:	zi...@sc....(none)	04/03/04 12:01:06

Log message:
  conflict fixes from import linuxppc (2.4.25)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/Documentation/filesystems/:
        00-INDEX 
      2.3/arch/ppc/:
        config.in defconfig 
      2.3/arch/ppc/configs/:
        apus_defconfig 
      2.3/arch/ppc/kernel/:
        ppc_ksyms.c setup.c 
      2.3/arch/ppc/mm/:
        pgtable.c 
      2.3/drivers/char/:
        Config.in Makefile genrtc.c 
      2.3/drivers/parport/:
        Config.in Makefile 
      2.3/drivers/scsi/:
        53c7xx.h Config.in Makefile NCR53C9x.h 
      2.3/drivers/video/:
        Config.in fbmem.c 
      2.3/fs/:
        Config.in Makefile buffer.c 
      2.3/include/asm-ppc/:
        zorro.h 
      2.3/include/linux/:
        fs.h 
      2.3/mm/:
        page_alloc.c 
Added files:
      2.3/drivers/message/fusion/lsi/:
        mpi_tool.h 
Removed files:
      2.3/arch/cris/kernel/:
        hexify.c ksyms.c 
      2.3/arch/mips/galileo-boards/ev64120/compressed/:
        Makefile README burner.c doit.c etherboot.h 
        evb64120A_Setup.c fixit flashdrv.c galileo_port.h 
        gt64011.h head.S ld.script.gal ld.sys.big.Flash 
        ld.sys.big.Flash2 ld.sys.big.burner load.c meminit.S 
        memory.c misc.c ns16550.h osdep.h pci.c pci_etherboot.c 
        pci_etherboot.h sbd.h sbdreset_evb64120A.S xfer.c 
      2.3/arch/mips/jmr3927/common/:
        rtc_ds1742.c 
      2.3/arch/mips/mm/:
        pg-r3k.c pg-r4k.S 
      2.3/arch/mips/vr41xx/common/:
        time.c 
      2.3/arch/ppc/boot/prep/:
        of1275.c of1275.h 
      2.3/drivers/net/:
        meth.c meth.h 
      2.3/drivers/usb/:
        ax8817x.c 
      2.3/include/asm-mips/:
        semaphore-helper.h 
      2.3/include/asm-mips64/:
        semaphore-helper.h 
  
  Revision      Changes    Path
  1.39          +2 -2      2.3/Makefile
  1.31          +323 -115  2.3/Documentation/Configure.help
  1.3           +2 -0      2.3/Documentation/filesystems/00-INDEX
  1.37          +28 -4     2.3/arch/ppc/config.in
  1.28          +1 -1      2.3/arch/ppc/defconfig
  1.24          +1 -1      2.3/arch/ppc/configs/apus_defconfig
  1.35          +6 -0      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.29          +3 -3      2.3/arch/ppc/kernel/setup.c
  1.9           +1 -1      2.3/arch/ppc/mm/pgtable.c
  1.12          +81 -46    2.3/drivers/char/Config.in
  1.24          +24 -6     2.3/drivers/char/Makefile
  1.4           +55 -47    2.3/drivers/char/genrtc.c
  1.3           +7 -7      2.3/drivers/parport/Config.in
  1.3           +1 -0      2.3/drivers/parport/Makefile
  1.5           +4 -0      2.3/drivers/scsi/53c7xx.h
  1.18          +1 -5      2.3/drivers/scsi/Config.in
  1.14          +1 -4      2.3/drivers/scsi/Makefile
  1.5           +1 -2      2.3/drivers/scsi/NCR53C9x.h
  1.13          +10 -5     2.3/drivers/video/Config.in
  1.18          +10 -1     2.3/drivers/video/fbmem.c
  1.6           +7 -0      2.3/fs/Config.in
  1.6           +1 -1      2.3/fs/Makefile
  1.8           +50 -11    2.3/fs/buffer.c
  1.3           +1 -1      2.3/include/asm-ppc/zorro.h
  1.10          +47 -2     2.3/include/linux/fs.h
  1.25          +19 -1     2.3/mm/page_alloc.c