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@sc8-pr-cvs1.	03/12/20 14:35:38

Log message:
  conflict fixes from import linuxppc (2.4.23)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        Makefile config.in 
      2.3/arch/ppc/configs/:
        apus_defconfig 
      2.3/arch/ppc/kernel/:
        head.S ppc-stub.c ppc_ksyms.c setup.c 
      2.3/arch/ppc/mm/:
        pgtable.c 
      2.3/drivers/char/:
        Config.in Makefile mem.c ser_a2232.c 
      2.3/drivers/ide/:
        ide-probe.c 
      2.3/drivers/net/:
        8390.h Makefile zorro8390.c 
      2.3/drivers/scsi/:
        Config.in Makefile 
      2.3/drivers/sound/dmasound/:
        dmasound_core.c 
      2.3/drivers/video/:
        Config.in 
      2.3/fs/:
        Config.in buffer.c 
      2.3/include/asm-ppc/:
        io.h mpc8xx.h 
      2.3/include/linux/:
        fs.h 
      2.3/mm/:
        page_alloc.c 
Removed files:
      2.3/arch/i386/kernel/:
        acpitable.c acpitable.h 
      2.3/arch/ppc/boot/utils/:
        mkimage.wrapper 
      2.3/arch/sh/mm/:
        __clear_user_page-sh4.S __copy_user_page-sh4.S 
      2.3/drivers/bluetooth/:
        bfusb.h 
      2.3/drivers/ide/:
        ide-sibyte.c 
      2.3/drivers/net/:
        ariadne2.c 
      2.3/drivers/net/wan/8253x/:
        build 
      2.3/drivers/usb/:
        hc_simple.c hc_simple.h hc_sl811.c hc_sl811.h 
        hc_sl811_rh.c 
  
  Revision      Changes    Path
  1.37          +2 -1      2.3/Makefile
  1.30          +1194 -157 2.3/Documentation/Configure.help
  1.16          +9 -14     2.3/arch/ppc/Makefile
  1.36          +137 -15   2.3/arch/ppc/config.in
  1.22          +1 -1      2.3/arch/ppc/configs/apus_defconfig
  1.31          +91 -15    2.3/arch/ppc/kernel/head.S
  1.10          +17 -16    2.3/arch/ppc/kernel/ppc-stub.c
  1.34          +25 -12    2.3/arch/ppc/kernel/ppc_ksyms.c
  1.28          +3 -5      2.3/arch/ppc/kernel/setup.c
  1.8           +30 -10    2.3/arch/ppc/mm/pgtable.c
  1.11          +25 -3     2.3/drivers/char/Config.in
  1.23          +4 -1      2.3/drivers/char/Makefile
  1.14          +11 -3     2.3/drivers/char/mem.c
  1.7           +1 -1      2.3/drivers/char/ser_a2232.c
  1.11          +80 -70    2.3/drivers/ide/ide-probe.c
  1.7           +2 -1      2.3/drivers/net/8390.h
  1.17          +3 -1      2.3/drivers/net/Makefile
  1.2           +8 -4      2.3/drivers/net/zorro8390.c
  1.17          +1 -0      2.3/drivers/scsi/Config.in
  1.13          +2 -1      2.3/drivers/scsi/Makefile
  1.9           +14 -12    2.3/drivers/sound/dmasound/dmasound_core.c
  1.12          +22 -11    2.3/drivers/video/Config.in
  1.5           +4 -0      2.3/fs/Config.in
  1.7           +50 -18    2.3/fs/buffer.c
  1.17          +45 -12    2.3/include/asm-ppc/io.h
  1.9           +4 -0      2.3/include/asm-ppc/mpc8xx.h
  1.9           +4 -0      2.3/include/linux/fs.h
  1.24          +114 -56   2.3/mm/page_alloc.c