CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/sound/pcmcia/vx/
Changes by:	zi...@sc....(none)	05/09/18 06:03:37

Log message:
  conflict fixes from import of 2.6.13

Modified files:
      ./:
        Makefile 
      2.6/arch/ppc/:
        Makefile 
      2.6/arch/ppc/kernel/:
        Makefile entry.S misc.S ppc_ksyms.c setup.c time.c 
      2.6/arch/ppc/mm/:
        init.c pgtable.c 
      2.6/include/asm-ppc/:
        machdep.h pgtable.h 
Removed files:
      2.6/Documentation/DocBook/:
        scsidrivers.tmpl 
      2.6/Documentation/dvb/:
        README.dibusb 
      2.6/Documentation/i2c/:
        sysfs-interface 
      2.6/Documentation/i2c/chips/:
        smsc47b397.txt 
      2.6/Documentation/networking/:
        wanpipe.txt 
      2.6/arch/arm/configs/:
        omnimeter_defconfig 
      2.6/arch/arm/kernel/:
        arch.c 
      2.6/arch/arm/lib/:
        longlong.h udivdi3.c 
      2.6/arch/arm/mach-omap/:
        Kconfig Makefile Makefile.boot board-generic.c board-h2.c 
        board-h3.c board-innovator.c board-netstar.c board-osk.c 
        board-perseus2.c board-voiceblue.c clock.c clock.h 
        common.c common.h dma.c fpga.c gpio.c irq.c 
        leds-h2p2-debug.c leds-innovator.c leds-osk.c leds.c 
        leds.h mcbsp.c mux.c ocpi.c pm.c sleep.S time.c usb.c 
      2.6/arch/ia64/sn/include/pci/:
        pcibr_provider.h pic.h tiocp.h 
      2.6/arch/mips/vr41xx/common/:
        giu.c 
      2.6/arch/ppc/boot/utils/:
        addSystemMap.c 
      2.6/arch/ppc/syslib/:
        ppc4xx_kgdb.c 
      2.6/arch/ppc64/boot/:
        mknote.c piggyback.c 
      2.6/arch/ppc64/kernel/:
        XmPciLpEvent.c iSeries_pci_reset.c 
      2.6/arch/um/kernel/skas/:
        time.c 
      2.6/arch/um/kernel/tt/:
        time.c unmap.c 
      2.6/drivers/base/:
        class_simple.c 
      2.6/drivers/i2c/chips/:
        adm1021.c adm1025.c adm1026.c adm1031.c asb100.c ds1621.c 
        fscher.c fscpos.c gl518sm.c gl520sm.c it87.c lm63.c 
        lm75.c lm75.h lm77.c lm78.c lm80.c lm83.c lm85.c lm87.c 
        lm90.c lm92.c max1619.c pc87360.c sis5595.c smsc47b397.c 
        smsc47m1.c via686a.c w83627hf.c w83781d.c w83l785ts.c 
      2.6/drivers/ide/cris/:
        ide-v10.c 
      2.6/drivers/input/gameport/:
        cs461x.c vortex.c 
      2.6/drivers/isdn/hisax/:
        enternow.h st5481_hdlc.c st5481_hdlc.h 
      2.6/drivers/isdn/sc/:
        debug.c 
      2.6/drivers/macintosh/:
        macserial.c macserial.h 
      2.6/drivers/media/dvb/b2c2/:
        skystar2.c 
      2.6/drivers/media/dvb/dibusb/:
        Kconfig Makefile dvb-dibusb-core.c dvb-dibusb-dvb.c 
        dvb-dibusb-fe-i2c.c dvb-dibusb-firmware.c 
        dvb-dibusb-remote.c dvb-dibusb-usb.c dvb-dibusb.h 
        dvb-fe-dtt200u.c 
      2.6/drivers/mtd/maps/:
        db1550-flash.c db1x00-flash.c elan-104nc.c pb1550-flash.c 
        pb1xxx-flash.c 
      2.6/drivers/mtd/nand/:
        tx4925ndfmc.c tx4938ndfmc.c 
      2.6/drivers/net/:
        fmv18x.c sk_g16.c sk_g16.h smc-mca.h 
      2.6/drivers/net/skfp/:
        lnkstat.c smtparse.c 
      2.6/drivers/pci/hotplug/:
        acpiphp_pci.c acpiphp_res.c 
      2.6/drivers/scsi/:
        pci2000.c pci2220i.c pci2220i.h psi_dale.h psi_roy.h 
      2.6/drivers/serial/:
        bast_sio.c 
      2.6/drivers/usb/atm/:
        usb_atm.c usb_atm.h 
      2.6/fs/freevxfs/:
        vxfs_kcompat.h 
      2.6/include/asm-m32r/:
        m32102peri.h 
      2.6/include/asm-ppc/:
        fsl_ocp.h 
      2.6/include/asm-ppc64/iSeries/:
        HvCallCfg.h LparData.h XmPciLpEvent.h iSeries_proc.h 
      2.6/include/linux/:
        ioc4_common.h pci-dynids.h xattr_acl.h 
      2.6/include/linux/netfilter_ipv4/:
        lockhelp.h 
      2.6/net/ipv4/:
        utils.c 
      2.6/sound/pcmcia/vx/:
        vx_entry.c vxp440.c 
  
  Revision      Changes    Path
  1.16          +8 -4      2.6/Makefile
  1.8           +2 -1      2.6/arch/ppc/Makefile
  1.11          +3 -0      2.6/arch/ppc/kernel/Makefile
  1.10          +82 -108   2.6/arch/ppc/kernel/entry.S
  1.13          +15 -1     2.6/arch/ppc/kernel/misc.S
  1.13          +1 -3      2.6/arch/ppc/kernel/ppc_ksyms.c
  1.13          +2 -15     2.6/arch/ppc/kernel/setup.c
  1.9           +8 -5      2.6/arch/ppc/kernel/time.c
  1.9           +16 -18    2.6/arch/ppc/mm/init.c
  1.12          +0 -1      2.6/arch/ppc/mm/pgtable.c
  1.9           +31 -0     2.6/include/asm-ppc/machdep.h
  1.10          +49 -5     2.6/include/asm-ppc/pgtable.h