CVS Update: 2.3 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/net/econet/
Changes by:	zippel@usw-pr-cvs1.	01/05/03 17:36:17

Log message:
  conflict fixes from import bitkeeper (2.4.4)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        config.in 
      2.3/arch/ppc/kernel/:
        head.S irq.c pci.c ppc_ksyms.c time.c 
      2.3/arch/ppc/mm/:
        init.c 
      2.3/drivers/char/:
        Makefile misc.c 
      2.3/drivers/net/:
        8390.h Makefile ariadne2.c 
      2.3/drivers/scsi/:
        fastlane.c 
      2.3/drivers/video/:
        Config.in fbmem.c 
      2.3/include/asm-m68k/:
        bootinfo.h 
      2.3/include/linux/:
        coda.h 
      2.3/mm/:
        page_alloc.c 
Added files:
      2.3/arch/ppc/configs/:
        gemini_defconfig 
      2.3/drivers/net/:
        ncr885_debug.h ncr885e.c ncr885e.h 
Removed files:
      ./:
        .#Makefile.1.15 .#Makefile.1.16 .#Makefile.1.17 
        .#Makefile.1.18 .swo .swp 
      2.3/Documentation/:
        .#Configure.help.1.10 .#Configure.help.1.7 
        .#Configure.help.1.8 .#Configure.help.1.9 logo.gif 
      2.3/Documentation/sound/:
        PCM1-pro 
      2.3/arch/alpha/:
        vmlinux.lds 
      2.3/arch/arm/kernel/:
        leds-ebsa110.c 
      2.3/arch/arm/lib/:
        io.c 
      2.3/arch/arm/mm/:
        mm-ebsa110.c mm-footbridge.c 
      2.3/arch/arm/nwfpe/:
        config.h 
      2.3/arch/m68k/:
        .#config.in.1.4 
      2.3/arch/m68k/amiga/:
        .#amiga_ksyms.c.1.3 .#amisound.c.1.4 .#chipram.c.1.4 
        .#config.c.1.5 
      2.3/arch/m68k/kernel/:
        m68k_defs.h 
      2.3/arch/mips/arc/:
        printf.c 
      2.3/arch/mips/ddb5074/:
        pci-dma.c 
      2.3/arch/mips/orion/:
        Makefile int-handler.S irq.c ld.script.orion misc.c 
        no_initrd.c piggyback.c promcon.c setup.c 
      2.3/arch/ppc/:
        .#Makefile.1.2 .#Makefile.1.3 .#config.in.1.16 
        .#config.in.1.18 .#config.in.1.19 .#defconfig.1.4 
      2.3/arch/ppc/amiga/:
        .#amiints.c.1.4 .#config.c.1.10 
      2.3/arch/ppc/kernel/:
        .#Makefile.1.7 .#Makefile.1.8 .#apus_setup.c.1.10 
        .#apus_setup.c.1.12 .#head.S.1.14 .#head.S.1.15 
        .#pci.c.1.3 .#pci.c.1.4 .#pci.c.1.5 .#pci.c.1.6 
        .#ppc_ksyms.c.1.13 .#ppc_ksyms.c.1.14 .#ppc_ksyms.c.1.15 
        .#ppc_ksyms.c.1.16 .#setup.c.1.10 .#setup.c.1.11 
        .#setup.c.1.8 .#setup.c.1.9 .#time.c.1.5 .#time.c.1.6 
        .#time.c.1.7 mol.h 
      2.3/arch/ppc/mbxboot/:
        vmlinux.lds 
      2.3/arch/ppc/mm/:
        .#init.c.1.12 .#init.c.1.13 .#init.c.1.14 
      2.3/arch/s390/kernel/:
        cpcmd.h floatlib.c irqextras390.c mathemu.c 
      2.3/arch/s390x/kernel/:
        cpcmd.h cpprintk.c irqextras390.c 
      2.3/drivers/acpi/include/:
        config.h 
      2.3/drivers/block/:
        .#z2ram.c.1.2 
      2.3/drivers/char/:
        .#Makefile.1.8 .#Makefile.1.9 .#amigamouse.c.1.3 
        .#amikeyb.c.1.5 .#amiserial.c.1.4 
      2.3/drivers/ide/:
        .#buddha.c.1.2 .#gayle.c.1.4 
      2.3/drivers/net/:
        .#8390.h.1.2 .#Makefile.1.4 
      2.3/drivers/parport/:
        .#parport_amiga.c.1.5 .#parport_mfc3.c.1.2 
      2.3/drivers/s390/net/:
        ctc.c 
      2.3/drivers/scsi/:
        .#Config.in.1.5 .#Config.in.1.6 .#Makefile.1.2 
        .#Makefile.1.3 .#a2091.c.1.5 .#a2091.h.1.3 .#a3000.c.1.7 
        .#a3000.h.1.3 .#fastlane.c.1.4 
      2.3/drivers/sgi/char/:
        linux_logo.h 
      2.3/drivers/sound/:
        miroaci.h 
      2.3/drivers/video/:
        .#amifb.c.1.9 .#fbmem.c.1.5 .#fbmem.c.1.6 .#fbmem.c.1.7 
        .#pm2fb.c.1.4 .#virgefb.c.1.4 
      2.3/fs/affs/:
        .#namei.c.1.4 
      2.3/include/asm-arm/arch-cl7500/:
        shmparam.h 
      2.3/include/asm-ia64/sn/:
        cmn_err.h war.h 
      2.3/include/asm-ia64/sn/sn1/:
        war.h 
      2.3/include/asm-m68k/:
        .#amigahw.h.1.2 
      2.3/include/asm-ppc/:
        .#pgtable.h.1.5 semaphore-helper.h 
      2.3/include/asm-s390/:
        irqextras390.h major.h misc390.h s390-regs-common.h 
        semaphore-helper.h 
      2.3/include/asm-s390x/:
        irqextras390.h major.h misc390.h semaphore-helper.h 
      2.3/include/asm-sh/:
        pgalloc-2level.h 
      2.3/include/linux/netfilter_ipv4/:
        ip_nat_ftp.h 
      2.3/mm/:
        .#page_alloc.c.1.10 .#page_alloc.c.1.11 
        .#page_alloc.c.1.9 
      2.3/net/econet/:
        sysctl_net_ec.c 
  
  Revision      Changes    Path
  1.20          +1 -1      2.3/Makefile
  1.12          +596 -236  2.3/Documentation/Configure.help
  1.22          +2 -1      2.3/arch/ppc/config.in
  1.17          +7 -60     2.3/arch/ppc/kernel/head.S
  1.6           +1 -1      2.3/arch/ppc/kernel/irq.c
  1.9           +26 -16    2.3/arch/ppc/kernel/pci.c
  1.18          +3 -20     2.3/arch/ppc/kernel/ppc_ksyms.c
  1.9           +11 -5     2.3/arch/ppc/kernel/time.c
  1.16          +61 -73    2.3/arch/ppc/mm/init.c
  1.12          +24 -0     2.3/drivers/char/Makefile
  1.3           +11 -9     2.3/drivers/char/misc.c
  1.4           +2 -1      2.3/drivers/net/8390.h
  1.6           +15 -2     2.3/drivers/net/Makefile
  1.7           +1 -1      2.3/drivers/net/ariadne2.c
  1.6           +17 -10    2.3/drivers/scsi/fastlane.c
  1.3           +8 -0      2.3/drivers/video/Config.in
  1.9           +13 -17    2.3/drivers/video/fbmem.c
  1.3           +1 -1      2.3/include/asm-m68k/bootinfo.h
  1.5           +31 -1     2.3/include/linux/coda.h
  1.13          +1 -3      2.3/mm/page_alloc.c