CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/net/sctp/
Changes by:	zi...@sc....(none)	04/02/21 13:42:04

Log message:
  conflict fixes from import of 2.6.3

Modified files:
      ./:
        Makefile 
      2.6/arch/ppc/:
        defconfig 
      2.6/arch/ppc/configs/:
        apus_defconfig 
      2.6/arch/ppc/kernel/:
        Makefile entry.S head.S misc.S ppc_ksyms.c setup.c 
      2.6/arch/ppc/mm/:
        init.c pgtable.c 
      2.6/include/asm-ppc/:
        bootinfo.h io.h machdep.h pgtable.h 
Added files:
      2.6/include/asm-sh/:
        io_generic.h 
Removed files:
      2.6/Documentation/networking/:
        8139too.txt 
      2.6/Documentation/scsi/:
        AM53C974.txt 
      2.6/arch/ppc/platforms/:
        prep_time.c 
      2.6/arch/ppc/platforms/4xx/:
        beech.c beech.h cedar.c cedar.h ibm405lp.c ibm405lp.h 
        ibmnp405l.c ibmnp405l.h ibmnp4gs.c ibmnp4gs.h ibmstb3.c 
        ibmstb3.h oak_setup.c redwood.c redwood.h 
      2.6/drivers/base/:
        memblk.c 
      2.6/drivers/char/watchdog/:
        i810-tco.c i810-tco.h 
      2.6/drivers/pci/:
        pool.c 
      2.6/drivers/scsi/:
        AM53C974.c AM53C974.h mac_NCR5380.c 
      2.6/drivers/usb/core/:
        usb-debug.c 
      2.6/drivers/usb/image/:
        scanner.c scanner.h 
      2.6/include/asm-i386/:
        memblk.h 
      2.6/include/asm-ia64/sn/:
        alenlist.h 
      2.6/include/asm-x86_64/:
        memblk.h 
      2.6/include/linux/:
        memblk.h pci_msi.h 
      2.6/lib/:
        mask.c 
      2.6/net/sctp/:
        adler32.c 
  
  Revision      Changes    Path
  1.5           +2 -2      2.6/Makefile
  1.3           +166 -148  2.6/arch/ppc/defconfig
  1.3           +166 -148  2.6/arch/ppc/configs/apus_defconfig
  1.4           +2 -1      2.6/arch/ppc/kernel/Makefile
  1.3           +2 -2      2.6/arch/ppc/kernel/entry.S
  1.3           +18 -63    2.6/arch/ppc/kernel/head.S
  1.4           +13 -19    2.6/arch/ppc/kernel/misc.S
  1.5           +1 -14     2.6/arch/ppc/kernel/ppc_ksyms.c
  1.4           +27 -15    2.6/arch/ppc/kernel/setup.c
  1.3           +2 -0      2.6/arch/ppc/mm/init.c
  1.3           +10 -0     2.6/arch/ppc/mm/pgtable.c
  1.3           +11 -0     2.6/include/asm-ppc/bootinfo.h
  1.3           +4 -1      2.6/include/asm-ppc/io.h
  1.3           +3 -1      2.6/include/asm-ppc/machdep.h
  1.4           +18 -6     2.6/include/asm-ppc/pgtable.h