CVS Update@oss.sgi.com: linux

[Ralf Baechle <ralf@oss.sgi.com>]

CVSROOT:        /home/pub/cvs
Module name:    linux
Changes by:     ralf@oss.sgi.com        00/08/28 15:00:26

Modified files:
        .              : CREDITS MAINTAINERS Makefile README 
                         REPORTING-BUGS Rules.make 
        Documentation  : Changes Configure.help README.DAC960 
                         digiboard.txt digiepca.txt kernel-docs.txt 
                         nmi_watchdog.txt oops-tracing.txt 
                         scsi-generic.txt watchdog.txt 
        Documentation/DocBook: Makefile 
        Documentation/fb: matroxfb.txt 
        Documentation/i386: IO-APIC.txt 
        Documentation/isdn: README README.HiSax README.eicon README.fax 
                            README.hysdn 
        Documentation/networking: arcnet-hardware.txt arcnet.txt 
                                  ax25.txt ethertap.txt ip-sysctl.txt 
                                  vortex.txt x25.txt 
        Documentation/sound: Soundblaster 
        Documentation/usb: proc_usb_info.txt usb-serial.txt 
        arch/alpha     : config.in 
        arch/alpha/kernel: entry.S osf_sys.c time.c 
        arch/arm       : Makefile config.in 
        arch/arm/boot  : Makefile 
        arch/arm/boot/compressed: Makefile head-netwinder.S 
                                  head-sa1100.S head.S setup-sa1100.S 
        arch/arm/kernel: Makefile arch.c armksyms.c bios32.c calls.S 
                         debug-armv.S dec21285.c dma-arc.c dma-rpc.c 
                         dma.c ecard.c entry-armo.S entry-armv.S 
                         entry-common.S fiq.c head-armo.S head-armv.S 
                         hw-footbridge.c hw-sa1100.c irq.c 
                         leds-footbridge.c leds-sa1100.c oldlatches.c 
                         process.c semaphore.c setup.c signal.c traps.c 
        arch/arm/lib   : Makefile uaccess.S 
        arch/arm/mm    : Makefile init.c mm-footbridge.c mm-l7200.c 
                         mm-sa1100.c proc-arm720.S proc-sa110.S 
        arch/arm/nwfpe : Makefile 
        arch/i386      : Makefile config.in defconfig 
        arch/i386/kernel: apic.c entry.S io_apic.c mca.c microcode.c 
                          mpparse.c setup.c smpboot.c 
        arch/ia64      : config.in vmlinux.lds.S 
        arch/ia64/dig  : iosapic.c machvec.c setup.c 
        arch/ia64/hp   : hpsim_machvec.c 
        arch/ia64/ia32 : ia32_entry.S sys_ia32.c 
        arch/ia64/kernel: Makefile acpi.c efi.c entry.S head.S 
                          ia64_ksyms.c irq_ia64.c ivt.S machvec.c pal.S 
                          palinfo.c pci-dma.c perfmon.c process.c 
                          ptrace.c sal.c semaphore.c setup.c smp.c 
                          time.c traps.c unwind.c 
        arch/ia64/lib  : memcpy.S 
        arch/ia64/mm   : init.c tlb.c 
        arch/ia64/sn/sn1: irq.c machvec.c setup.c 
        arch/m68k/kernel: entry.S 
        arch/mips      : config.in defconfig defconfig-cobalt 
                         defconfig-decstation defconfig-ip22 
                         defconfig-orion defconfig-rm200 
        arch/mips/kernel: syscalls.h sysirix.c 
        arch/mips64    : config.in defconfig defconfig-ip22 
                         defconfig-ip27 
        arch/mips64/kernel: linux32.c scall_64.S scall_o32.S 
        arch/ppc       : config.in 
        arch/ppc/kernel: misc.S 
        arch/s390      : config.in 
        arch/s390/kernel: entry.S 
        arch/sh/kernel : cf-enabler.c entry.S io.c io_generic.c 
                         mach_se.c mach_unknown.c setup_cqreek.c 
        arch/sparc     : config.in defconfig 
        arch/sparc/kernel: Makefile check_asm.sh sys_sunos.c systbls.S 
        arch/sparc/mm  : init.c srmmu.c sun4c.c 
        arch/sparc64   : config.in defconfig 
        arch/sparc64/kernel: Makefile check_asm.sh ioctl32.c process.c 
                             sparc64_ksyms.c sys_sparc32.c sys_sunos32.c 
                             systbls.S 
        arch/sparc64/lib: dec_and_lock.S 
        arch/sparc64/mm: fault.c 
        arch/sparc64/solaris: misc.c socket.c 
        drivers        : Makefile 
        drivers/acorn/block: Makefile fd1772.c 
        drivers/acorn/char: Makefile 
        drivers/acorn/scsi: Makefile 
        drivers/block  : DAC960.c DAC960.h elevator.c linear.c 
                         ll_rw_blk.c md.c raid0.c raid1.c raid5.c xor.c 
        drivers/char   : Config.in Makefile ds1620.c efirtc.c 
                         generic_serial.c nwbutton.c nwflash.c pcxx.c 
                         pcxx.h scan_keyb.c serial.c sx.c tty_io.c 
                         wdt285.c 
        drivers/char/agp: agp.h agpgart_be.c 
        drivers/char/drm: agpsupport.c auth.c drmP.h ffb_drv.c lists.c 
                          lock.c mga_dma.c r128_drv.c vm.c 
        drivers/char/joystick: Config.in Makefile amijoy.c db9.c 
                               gamecon.c ns558.c sidewinder.c 
                               spaceball.c 
        drivers/char/rio: linux_compat.h rio_linux.c rio_linux.h 
                          rioboot.c riocmd.c rioctrl.c rioinit.c 
                          riointr.c rioparam.c rioroute.c riotable.c 
                          riotty.c 
        drivers/isdn   : Config.in isdn_common.c isdn_net.c isdn_ppp.h 
        drivers/isdn/avmb1: b1.c b1dma.c b1pci.c c4.c capi.c capidrv.c 
                            capifs.c t1isa.c t1pci.c 
        drivers/isdn/divert: divert_procfs.c 
        drivers/isdn/eicon: Makefile eicon.h eicon_dsp.h eicon_idi.c 
                            eicon_idi.h eicon_io.c eicon_isa.c 
                            eicon_isa.h eicon_mod.c eicon_pci.c 
                            eicon_pci.h 
        drivers/isdn/hisax: Makefile avm_pci.c bkm_a4t.c bkm_a8.c 
                            bkm_ax.h callc.c cert.c config.c diva.c 
                            elsa.c gazel.c hfc_2bs0.c hfc_pci.c hisax.h 
                            isar.c isar.h isdnl1.c isdnl3.c l3_1tr6.c 
                            l3dss1.c md5sums.asc netjet.c niccy.c q931.c 
                            sedlbauer.c tei.c telespci.c w6692.c 
        drivers/isdn/hysdn: Makefile boardergo.c hysdn_boot.c 
                            hysdn_defs.h hysdn_init.c hysdn_net.c 
                            hysdn_procconf.c hysdn_proclog.c 
                            hysdn_sched.c ince1pc.h 
        drivers/isdn/icn: icn.c 
        drivers/isdn/pcbit: capi.c drv.c layer2.c layer2.h module.c 
        drivers/isdn/sc: timer.c 
        drivers/mtd    : Config.in 
        drivers/net    : 3c501.c 3c59x.c Config.in Makefile Space.c 
                         atp.c eepro100.c epic100.c ewrk3.c pppoe.c 
                         smc9194.c starfire.c sunlance.c tlan.c tlan.h 
                         via-rhine.c 
        drivers/net/fc : Makefile 
        drivers/net/hamradio: Makefile scc.c 
        drivers/net/irda: Makefile 
        drivers/net/pcmcia: Config.in xircom_tulip_cb.c 
        drivers/net/tulip: tulip_core.c 
        drivers/net/wan: Config.in Makefile cycx_main.c hostess_sv11.c 
                         sbni.c sealevel.c syncppp.c 
        drivers/pci    : pci.ids proc.c setup-res.c 
        drivers/pcmcia : cs.c 
        drivers/sbus/char: rtc.c sab82532.c 
        drivers/scsi   : README.tmscsim aic7xxx.c imm.h ppa.h qlogicfc.c 
                         scsi_error.c scsi_ioctl.c st.c 
        drivers/sound  : Config.in Makefile aci.c ad1816.c ad1848.c 
                         ad1848.h adlib_card.c aedsp16.c audio.c 
                         awe_wave.c cmpci.c cs4232.c dev_table.h 
                         es1370.c es1371.c gus_card.c gus_midi.c 
                         gus_wave.c i810_audio.c ics2101.c mad16.c 
                         maestro.c maui.c midi_synth.c midi_synth.h 
                         midibuf.c mpu401.c mpu401.h nm256_audio.c 
                         opl3.c opl3.h opl3sa.c opl3sa2.c pas2_card.c 
                         pas2_midi.c pas2_mixer.c pas2_pcm.c pss.c sb.h 
                         sb_audio.c sb_card.c sb_common.c sb_ess.c 
                         sb_midi.c sb_mixer.c sequencer.c sgalaxy.c 
                         skeleton.c softoss.c sonicvibes.c 
                         sound_config.h sound_syms.c sound_timer.c 
                         soundcard.c sscape.c sys_timer.c trident.c 
                         trix.c uart401.c uart6850.c v_midi.c 
                         via82cxxx_audio.c vidc.c waveartist.c 
                         wavfront.c wf_midi.c ymf_sb.c 
        drivers/sound/emu10k1: 8010.h Makefile audio.c audio.h cardmi.c 
                               cardmi.h cardmo.c cardmo.h cardwi.c 
                               cardwi.h cardwo.c cardwo.h emu_wrapper.h 
                               emuadxmg.c hwaccess.c hwaccess.h 
                               icardwav.h irqmgr.c irqmgr.h main.c 
                               midi.c mixer.c recmgr.c recmgr.h timer.c 
                               timer.h voicemgr.c voicemgr.h 
        drivers/usb    : Config.in Makefile bluetooth.c dc2xx.c devio.c 
                         hid.c hid.h inode.c pegasus.c printer.c 
                         usb-core.c usb-ohci.c usb-ohci.h usb-uhci.c 
                         usb.c usbkbd.c 
        drivers/usb/serial: digi_acceleport.c keyspan_pda.c usb-serial.h 
                            visor.c 
        drivers/usb/storage: Makefile scsiglue.c shuttle_usbat.c 
                             shuttle_usbat.h transport.c transport.h 
                             usb.c usb.h 
        drivers/video  : acornfb.c hgafb.c sa1100fb.c 
        drivers/video/matrox: matroxfb_DAC1064.c matroxfb_Ti3026.c 
                              matroxfb_accel.c matroxfb_base.c 
                              matroxfb_base.h matroxfb_misc.c 
        fs             : Config.in block_dev.c buffer.c dcache.c exec.c 
                         fcntl.c inode.c ioctl.c locks.c namei.c open.c 
                         pipe.c readdir.c stat.c super.c 
        fs/adfs        : dir.c 
        fs/affs        : dir.c 
        fs/autofs      : root.c 
        fs/autofs4     : expire.c 
        fs/bfs         : dir.c 
        fs/coda        : dir.c 
        fs/cramfs      : inode.c 
        fs/devfs       : base.c 
        fs/devpts      : root.c 
        fs/efs         : dir.c 
        fs/ext2        : dir.c 
        fs/fat         : dir.c 
        fs/hfs         : dir_cap.c dir_dbl.c dir_nat.c 
        fs/hpfs        : dir.c hpfs.h map.c 
        fs/isofs       : dir.c 
        fs/jffs        : inode-v23.c 
        fs/minix       : dir.c 
        fs/ncpfs       : dir.c 
        fs/nfs         : dir.c inode.c proc.c write.c 
        fs/nfsd        : nfs3xdr.c nfsfh.c nfsxdr.c 
        fs/nls         : Config.in 
        fs/ntfs        : fs.c 
        fs/openpromfs  : inode.c 
        fs/proc        : array.c base.c generic.c 
        fs/qnx4        : dir.c 
        fs/romfs       : inode.c 
        fs/smbfs       : ChangeLog Makefile dir.c inode.c proc.c sock.c 
        fs/sysv        : dir.c 
        fs/udf         : dir.c 
        fs/ufs         : dir.c 
        fs/umsdos      : dir.c rdir.c 
        include/asm-alpha: bitops.h fcntl.h mmu_context.h unistd.h 
        include/asm-arm: a.out.h assembler.h dma.h hardware.h leds.h 
                         mc146818rtc.h mmu_context.h page.h pgalloc.h 
                         pgtable.h resource.h system.h termbits.h 
                         termios.h uaccess.h unaligned.h unistd.h user.h 
        include/asm-arm/arch-arc: hardware.h ide.h irq.h system.h 
        include/asm-arm/arch-cl7500: dma.h hardware.h ide.h serial.h 
                                     time.h uncompress.h 
        include/asm-arm/arch-ebsa110: hardware.h 
        include/asm-arm/arch-ebsa285: hardware.h irq.h irqs.h keyboard.h 
                                      memory.h system.h time.h 
        include/asm-arm/arch-l7200: hardware.h ide.h io.h memory.h 
                                    system.h time.h uncompress.h 
        include/asm-arm/arch-rpc: hardware.h 
        include/asm-arm/arch-sa1100: hardware.h ide.h irq.h uncompress.h 
        include/asm-arm/arch-shark: keyboard.h 
        include/asm-arm/proc-armo: assembler.h cache.h system.h 
        include/asm-arm/proc-armv: assembler.h elf.h system.h uaccess.h 
        include/asm-i386: apic.h apicdef.h bugs.h e820.h fcntl.h 
                          mmu_context.h unistd.h 
        include/asm-ia64: acpi-ext.h asmmacro.h efi.h ia32.h io.h 
                          machvec.h machvec_dig.h machvec_init.h 
                          mmu_context.h offsets.h page.h pal.h param.h 
                          pci.h pgtable.h processor.h scatterlist.h 
                          siginfo.h smp.h spinlock.h system.h unistd.h 
        include/asm-m68k: mmu_context.h unistd.h 
        include/asm-mips: fcntl.h mmu_context.h unistd.h 
        include/asm-mips64: fcntl.h mmu_context.h unistd.h 
        include/asm-ppc: mmu_context.h unistd.h 
        include/asm-s390: mmu_context.h unistd.h 
        include/asm-sh : dma.h machvec_init.h mmu_context.h unistd.h 
        include/asm-sparc: bitops.h fcntl.h mmu_context.h page.h 
                           pgtable.h spinlock.h unistd.h 
        include/asm-sparc64: bitops.h fcntl.h hardirq.h kdebug.h 
                             mmu_context.h openprom.h page.h pgtable.h 
                             spinlock.h unistd.h 
        include/linux  : agp_backend.h capi.h dirent.h etherdevice.h 
                         file.h fs.h highmem.h if_packet.h in6.h input.h 
                         isdn.h isdn_divertif.h kernelcapi.h major.h 
                         mca.h mm.h netdevice.h pci_ids.h rtnetlink.h 
                         sched.h serial.h skbuff.h slab.h smb.h smb_fs.h 
                         smb_fs_sb.h smb_mount.h sound.h sysctl.h 
                         ufs_fs.h usb.h 
        include/linux/netfilter_ipv4: ip_conntrack_tuple.h ip_queue.h 
        include/linux/nfsd: nfsd.h xdr.h xdr3.h 
        include/linux/raid: md_k.h 
        include/net    : dst.h snmp.h sock.h tcp.h 
        init           : main.c 
        ipc            : shm.c 
        kernel         : exit.c fork.c ksyms.c sched.c signal.c timer.c 
        lib            : cmdline.c string.c 
        mm             : filemap.c highmem.c mmap.c slab.c 
        net            : netsyms.c socket.c 
        net/appletalk  : ddp.c 
        net/core       : dev.c neighbour.c sock.c 
        net/ethernet   : eth.c 
        net/ipv4       : Config.in Makefile af_inet.c devinet.c 
                         fib_semantics.c ip_input.c ip_sockglue.c proc.c 
                         raw.c route.c sysctl_net_ipv4.c tcp.c 
                         tcp_input.c tcp_ipv4.c tcp_output.c tcp_timer.c 
                         udp.c 
        net/ipv4/netfilter: Makefile ip_conntrack_core.c 
                            ip_conntrack_ftp.c ip_conntrack_standalone.c 
                            ip_nat_core.c ip_nat_ftp.c ip_nat_rule.c 
                            ip_queue.c ipt_LOG.c ipt_MASQUERADE.c 
                            ipt_REJECT.c ipt_limit.c ipt_owner.c 
        net/ipv6       : raw.c route.c tcp_ipv6.c udp.c 
        net/irda       : Config.in 
        net/packet     : af_packet.c 
        net/sched      : cls_tcindex.c sch_generic.c sch_gred.c 
                         sch_ingress.c sch_red.c 
        net/sunrpc     : sched.c 
        net/unix       : af_unix.c 
        scripts        : Menuconfig 
Added files:
        Documentation/arm/SA1100: CERF nanoEngine 
        Documentation/networking: tuntap.txt 
        Documentation/sparc: sbus_drivers.txt 
        arch/arm/boot/bootp: Makefile init.S 
        arch/arm/boot/compressed: head-l7200.S hw-bse.c 
        arch/arm/tools : gen-mach-types mach-types 
        drivers/char   : i810-tco.c i810-tco.h serial_21285.c 
        drivers/char/joystick: iforce.c 
        drivers/input  : Config.in Makefile evdev.c input.c joydev.c 
                         keybdev.c mousedev.c 
        drivers/isdn/eicon: Divas_mod.c adapter.h bri.c common.c 
                            constant.h divalog.h divas.h dsp_defs.h 
                            dspdids.h fcheck.c fourbri.c fpga.c idi.c 
                            idi.h kprintf.c lincfg.c linchr.c linio.c 
                            linsys.c log.c md5sums.asc pc.h pc_maint.h 
                            pr_pc.h pri.c sys.h uxio.h xlog.c 
        drivers/isdn/hisax: icc.c icc.h l3ni1.c l3ni1.h netjet.h nj_s.c 
                            nj_u.c 
        drivers/isdn/hysdn: hycapi.c 
        drivers/media  : Config.in Makefile happy.c 
        drivers/media/radio: Config.in Makefile radio-aimslab.c 
                             radio-aztech.c radio-cadet.c radio-gemtek.c 
                             radio-miropcm20.c radio-rtrack2.c 
                             radio-sf16fmi.c radio-terratec.c 
                             radio-trust.c radio-typhoon.c 
                             radio-zoltrix.c 
        drivers/media/video: Config.in Makefile audiochip.h bt848.h 
                             bttv-cards.c bttv-driver.c bttv-if.c bttv.h 
                             buz.c buz.h bw-qcam.c bw-qcam.h c-qcam.c 
                             cpia.c cpia.h cpia_pp.c cpia_usb.c cs8420.h 
                             i2c-old.c i2c-parport.c ibmmpeg2.h 
                             msp3400.c planb.c planb.h pms.c saa5249.c 
                             saa7110.c saa7111.c saa7121.h saa7146.h 
                             saa7146reg.h saa7185.c saa7196.h stallion.c 
                             stradis.c tda7432.c tda8425.c tda985x.c 
                             tda9875.c tea6300.c tea6420.c tuner-3036.c 
                             tuner.c tuner.h tvmixer.c videodev.c vino.c 
                             vino.h zr36057.h zr36060.h zr36120.c 
                             zr36120.h zr36120_i2c.c zr36120_mem.c 
                             zr36120_mem.h 
        drivers/net    : natsemi.c tun.c 
        drivers/sound  : cs461x.h cs461x_image.h cs46xx.c 
        drivers/sound/emu10k1: ecard.c ecard.h 
        drivers/usb/storage: dpcm.c dpcm.h 
        fs/smbfs       : getopt.c getopt.h 
        include/asm-arm/arch-sa1100: cerf.h 
        include/asm-arm/proc-armo: locks.h 
        include/linux  : if_tun.h 
        include/net    : tcp_ecn.h 
        net/ipv4       : tcp_minisocks.c 
Removed files:
        drivers/char   : audiochip.h bt848.h bttv-cards.c bttv-driver.c 
                         bttv-if.c bttv.h buz.c buz.h bw-qcam.c 
                         bw-qcam.h c-qcam.c cpia.c cpia.h cpia_pp.c 
                         cpia_usb.c cs8420.h i2c-old.c i2c-parport.c 
                         ibmmpeg2.h msp3400.c planb.c planb.h pms.c 
                         radio-aimslab.c radio-aztech.c radio-cadet.c 
                         radio-gemtek.c radio-miropcm20.c 
                         radio-rtrack2.c radio-sf16fmi.c 
                         radio-terratec.c radio-trust.c radio-typhoon.c 
                         radio-zoltrix.c saa5249.c saa7110.c saa7111.c 
                         saa7121.h saa7146.h saa7146reg.h saa7185.c 
                         saa7196.h stallion.c stradis.c tda7432.c 
                         tda8425.c tda985x.c tda9875.c tea6300.c 
                         tea6420.c tuner-3036.c tuner.c tuner.h 
                         tvmixer.c videodev.c vino.c vino.h zr36057.h 
                         zr36060.h zr36120.c zr36120.h zr36120_i2c.c 
                         zr36120_mem.c zr36120_mem.h 
        drivers/sound  : soundmodule.h 
        drivers/sound/emu10k1: efxmgr.c osutils.c 
        drivers/usb    : evdev.c iforce.c input.c joydev.c keybdev.c 
                         mousedev.c 
        include/asm-sparc: md.h 
        include/asm-sparc64: machines.h md.h 

Log message:
        Merge with 2.4.0-test7.