CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/scripts/
Changes by:	zi...@sc....(none)	04/05/23 16:19:41

Log message:
  conflict fixes from import of 2.6.5

Modified files:
      ./:
        Makefile 
      2.6/arch/ppc/:
        defconfig 
      2.6/arch/ppc/configs/:
        apus_defconfig 
      2.6/arch/ppc/kernel/:
        entry.S head.S misc.S ppc_ksyms.c 
      2.6/arch/ppc/mm/:
        pgtable.c 
      2.6/include/asm-ppc/:
        io.h machdep.h 
Removed files:
      2.6/Documentation/usb/:
        brlvger.txt scanner.txt 
      2.6/arch/arm/mach-anakin/:
        Makefile arch.c irq.c mm.c 
      2.6/arch/h8300/platform/h8300h/:
        ints.c 
      2.6/arch/i386/kernel/:
        edd.c 
      2.6/arch/i386/lib/:
        iodebug.c 
      2.6/arch/ia64/hp/sim/:
        simscsi.h 
      2.6/arch/ppc/boot/common/:
        cpc700_memory.c mpc10x_memory.c 
      2.6/arch/ppc/boot/prep/:
        Makefile dummy.c head.S iso_font.h kbd.c misc.c vreset.c 
      2.6/arch/ppc/platforms/:
        pplus_pci.c pplus_setup.c spruce_pci.c spruce_serial.h 
        spruce_setup.c 
      2.6/arch/ppc64/kernel/:
        pmc.c proc_pmc.c 
      2.6/arch/sh/configs/:
        defconfig-adx defconfig-cqreek defconfig-dreamcast 
        defconfig-hp680 defconfig-se7751 defconfig-snapgear 
        defconfig-systemh 
      2.6/arch/sh/drivers/pci/:
        pci-dma.c 
      2.6/arch/x86_64/ia32/:
        vsyscall.S 
      2.6/arch/x86_64/kernel/acpi/:
        boot.c 
      2.6/arch/x86_64/lib/:
        iodebug.c 
      2.6/drivers/i2c/busses/:
        i2c-elv.c i2c-philips-par.c i2c-velleman.c 
      2.6/drivers/input/misc/:
        gsc_ps2.c 
      2.6/drivers/isdn/hardware/eicon/:
        dlist.c dlist.h i4l_idi.c i4l_idi.h i4lididrv.c 
        i4lididrv.h 
      2.6/drivers/macintosh/:
        therm_adt7467.c 
      2.6/drivers/serial/:
        anakin.c 
      2.6/drivers/usb/misc/:
        brlvger.c 
      2.6/drivers/video/:
        anakinfb.c 
      2.6/include/asm-arm/arch-anakin/:
        dma.h hardware.h ide.h io.h irqs.h memory.h param.h 
        serial.h serial_reg.h system.h time.h timex.h 
        uncompress.h vmalloc.h 
      2.6/include/asm-i386/:
        edd.h 
      2.6/include/asm-parisc/:
        keyboard.h md.h 
      2.6/include/asm-ppc/:
        pplus.h 
      2.6/include/asm-ppc64/:
        pmc.h proc_fs.h proc_pmc.h 
      2.6/include/asm-sh/dreamcast/:
        io.h 
      2.6/include/asm-sh/sh2000/:
        io.h 
      2.6/include/linux/:
        brlvger.h hpfs_fs_i.h hpfs_fs_sb.h 
      2.6/scripts/:
        docproc.c fixdep.c split-include.c 
  
  Revision      Changes    Path
  1.7           +62 -49    2.6/Makefile
  1.5           +14 -9     2.6/arch/ppc/defconfig
  1.5           +14 -9     2.6/arch/ppc/configs/apus_defconfig
  1.4           +22 -4     2.6/arch/ppc/kernel/entry.S
  1.5           +4 -7      2.6/arch/ppc/kernel/head.S
  1.5           +1 -11     2.6/arch/ppc/kernel/misc.S
  1.6           +0 -7      2.6/arch/ppc/kernel/ppc_ksyms.c
  1.4           +1 -1      2.6/arch/ppc/mm/pgtable.c
  1.4           +29 -25    2.6/include/asm-ppc/io.h
  1.5           +2 -0      2.6/include/asm-ppc/machdep.h