CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/net/ipv4/
Changes by:	zi...@sc....(none)	05/07/30 11:52:54

Log message:
  conflict fixes from import of 2.6.9

Modified files:
      ./:
        Makefile 
      2.6/arch/ppc/:
        Makefile defconfig 
      2.6/arch/ppc/amiga/:
        config.c 
      2.6/arch/ppc/configs/:
        apus_defconfig 
      2.6/arch/ppc/kernel/:
        Makefile entry.S head.S misc.S ppc_ksyms.c setup.c time.c 
      2.6/arch/ppc/mm/:
        init.c pgtable.c 
      2.6/drivers/block/:
        amiflop.c 
      2.6/include/asm-ppc/:
        io.h 
      2.6/include/video/:
        vga.h 
Removed files:
      2.6/Documentation/usb/:
        philips.txt 
      2.6/arch/alpha/lib/:
        io.c 
      2.6/arch/arm/configs/:
        iq80310_defconfig 
      2.6/arch/arm/mach-iop3xx/:
        iop310-irq.c iop310-pci.c iq80310-irq.c iq80310-pci.c 
        iq80310-time.c mm.c xs80200-irq.c 
      2.6/arch/arm/mach-omap/:
        bus.c leds-perseus2.c 
      2.6/arch/i386/kernel/:
        vsyscall.lds 
      2.6/arch/i386/power/:
        pmdisk.S 
      2.6/arch/ia64/sn/fakeprom/:
        Makefile README fpmem.c fpmem.h fprom.lds fpromasm.S 
        fw-emu.c klgraph_init.c main.c make_textsym runsim 
      2.6/arch/ppc/boot/include/:
        zlib.h 
      2.6/arch/ppc/boot/lib/:
        zlib.c 
      2.6/arch/ppc/boot/simple/:
        chrpmap.S legacy.S 
      2.6/arch/ppc/platforms/:
        est8260_setup.c lopec_pci.c lopec_serial.h lopec_setup.c 
        mcpn765_serial.h mvme5100_pci.c mvme5100_serial.h 
        mvme5100_setup.c powerpmc250_serial.h pq2ads_setup.c 
        prpmc750_serial.h prpmc800_serial.h rpx8260.c 
      2.6/arch/ppc64/boot/:
        addSystemMap.c 
      2.6/arch/ppc64/kernel/:
        chrp_setup.c pSeries_htab.c pmac_iommu.c stab.c 
      2.6/arch/sparc64/lib/:
        U3copy_in_user.S VIScopy.S rwlock.S splock.S 
      2.6/arch/um/:
        dyn.lds.S main.c uml.lds.S 
      2.6/arch/um/drivers/:
        hostaudio_user.c 
      2.6/arch/um/include/:
        Makefile hostaudio.h 
      2.6/arch/um/kernel/:
        mprot.h user_syms.c vmlinux.lds.S 
      2.6/arch/um/sys-i386/:
        extable.c 
      2.6/arch/x86_64/kernel/:
        Makefile-HEAD domain.c 
      2.6/drivers/char/:
        busmouse.c busmouse.h 
      2.6/drivers/i2c/:
        i2c-sensor.c 
      2.6/drivers/message/fusion/:
        ascq_tbl.c ascq_tbl.sh isense.c isense.h scsi3.h 
        scsiops.c 
      2.6/drivers/message/i2o/:
        i2o_core.c 
      2.6/drivers/scsi/:
        dc390.h 
      2.6/drivers/usb/host/:
        ohci-omap.h 
      2.6/drivers/usb/media/:
        pwc-ctrl.c pwc-if.c pwc-ioctl.h pwc-misc.c 
        pwc-uncompress.c pwc-uncompress.h pwc.h pwc_kiara.h 
        pwc_nala.h pwc_timon.h 
      2.6/fs/xfs/:
        xfs_cap.c xfs_mac.c 
      2.6/include/asm-arm/arch-iop3xx/:
        iop310-irqs.h iop310.h iq80310.h pmon.h 
      2.6/include/asm-arm/arch-omap/:
        bus.h 
      2.6/include/asm-h8300/:
        softirq.h 
      2.6/include/asm-mips/:
        mv64340.h 
      2.6/include/asm-ppc64/:
        bootx.h 
      2.6/include/asm-sh64/:
        smplock.h softirq.h 
      2.6/include/asm-um/:
        module.h smplock.h 
      2.6/include/linux/netfilter_ipv6/:
        ip6t_REJECT.h 
      2.6/include/sound/:
        sndmagic.h 
      2.6/kernel/power/:
        pmdisk.c 
      2.6/lib/zlib_inflate/:
        inffixed.h 
      2.6/net/ipv4/:
        ip_nat_dumb.c 
  
  Revision      Changes    Path
  1.12          +217 -115  2.6/Makefile
  1.5           +18 -16    2.6/arch/ppc/Makefile
  1.10          +24 -12    2.6/arch/ppc/defconfig
  1.4           +0 -3      2.6/arch/ppc/amiga/config.c
  1.10          +24 -12    2.6/arch/ppc/configs/apus_defconfig
  1.7           +1 -1      2.6/arch/ppc/kernel/Makefile
  1.7           +2 -2      2.6/arch/ppc/kernel/entry.S
  1.9           +8 -8      2.6/arch/ppc/kernel/head.S
  1.9           +15 -18    2.6/arch/ppc/kernel/misc.S
  1.9           +4 -0      2.6/arch/ppc/kernel/ppc_ksyms.c
  1.8           +7 -1      2.6/arch/ppc/kernel/setup.c
  1.5           +10 -33    2.6/arch/ppc/kernel/time.c
  1.6           +5 -0      2.6/arch/ppc/mm/init.c
  1.8           +13 -0     2.6/arch/ppc/mm/pgtable.c
  1.3           +2 -14     2.6/drivers/block/amiflop.c
  1.9           +73 -1     2.6/include/asm-ppc/io.h
  1.4           +23 -23    2.6/include/video/vga.h