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/06/14 18:56:05

Modified files:
        .              : CREDITS MAINTAINERS Makefile 
        Documentation  : Configure.help pci.txt 
        Documentation/DocBook: Makefile kernel-api.tmpl parportbook.tmpl 
        Documentation/filesystems: cramfs.txt 
        Documentation/kbuild: config-language.txt 
        Documentation/networking: 8139too.txt 
        Documentation/s390: DASD 
        Documentation/usb: ov511.txt usb-serial.txt 
        Documentation/video4linux/bttv: CARDLIST 
        arch/alpha/kernel: osf_sys.c 
        arch/arm       : Makefile 
        arch/arm/def-configs: ebsa110 footbridge rpc 
        arch/arm/kernel: Makefile traps.c 
        arch/arm/lib   : Makefile 
        arch/i386      : config.in defconfig 
        arch/i386/kernel: acpi.c apic.c apm.c i8259.c io_apic.c irq.c 
                          ldt.c mpparse.c pci-i386.c pci-irq.c pci-pc.c 
                          setup.c traps.c 
        arch/i386/mm   : init.c 
        arch/ia64/ia32 : sys_ia32.c 
        arch/mips/mm   : umap.c 
        arch/mips64    : defconfig defconfig-ip22 defconfig-ip27 
        arch/ppc       : defconfig vmlinux.lds 
        arch/ppc/8260_io: enet.c uart.c 
        arch/ppc/configs: common_defconfig 
        arch/ppc/kernel: chrp_pci.c chrp_setup.c chrp_time.c entry.S 
                         head.S ppc_ksyms.c ptrace.c setup.c time.c 
                         traps.c 
        arch/ppc/mbxboot: Makefile embed_config.c head_8260.S misc.c 
        arch/ppc/mm    : fault.c init.c 
        arch/ppc/treeboot: mkevimg mkirimg 
        arch/sh        : config.in defconfig 
        arch/sh/kernel : Makefile entry.S irq.c ptrace.c signal.c time.c 
        arch/sh/lib    : checksum.S 
        arch/sh/mm     : cache.c fault.c 
        arch/sparc     : config.in 
        arch/sparc/kernel: Makefile entry.S head.S irq.c process.c 
                           setup.c signal.c sparc_ksyms.c sun4d_irq.c 
                           sys_sunos.c time.c traps.c 
        arch/sparc/lib : rwsem.S 
        arch/sparc/mm  : btfixup.c hypersparc.S init.c srmmu.c sun4c.c 
                         swift.S tsunami.S viking.S 
        arch/sparc64   : config.in 
        arch/sparc64/kernel: Makefile head.S ioctl32.c irq.c process.c 
                             setup.c sparc64_ksyms.c sys_sparc32.c 
                             sys_sunos32.c systbls.S time.c traps.c 
                             ttable.S 
        arch/sparc64/lib: debuglocks.c 
        arch/sparc64/mm: init.c ultra.S 
        arch/sparc64/prom: misc.c 
        arch/sparc64/solaris: misc.c 
        drivers/acorn/net: Makefile ether1.c ether3.c etherh.c 
        drivers/atm    : eni.c 
        drivers/block  : Config.in DAC960.c DAC960.h elevator.c floppy.c 
                         loop.c xor.c 
        drivers/char   : Config.in Makefile bttv.c bttv.h epca.c 
                         generic_serial.c lp.c mem.c msp3400.c rtc.c 
                         sh-sci.c sh-sci.h sx.c tda8425.c tda985x.c 
                         tty_io.c videodev.c 
        drivers/char/rio: func.h host.h linux_compat.h rio_linux.c 
                          rio_linux.h rioboot.c riocmd.c rioctrl.c 
                          rioinit.c riotty.c unixrup.h 
        drivers/ide    : Config.in aec62xx.c alim15x3.c amd7409.c 
                         cmd64x.c hd.c hpt34x.c hpt366.c icside.c 
                         ide-disk.c ide-features.c ide-pci.c ide-pmac.c 
                         ide-probe.c ide.c pdc202xx.c piix.c qd6580.c 
                         sis5513.c via82cxxx.c 
        drivers/isdn/avmb1: kcapi.c 
        drivers/macintosh: Makefile adb.c mac_keyb.c macserial.c 
                           macserial.h mediabay.c nvram.c via-pmu.c 
        drivers/net    : 3c59x.c 8139too.c Config.in Makefile Space.c 
                         acenic.c am79c961a.c eepro100.c epic100.c 
                         hp100.c ncr885e.c ne2k-pci.c pcnet32.c 
                         ppp_synctty.c pppoe.c setup.c sis900.c slhc.c 
                         starfire.c via-rhine.c wavelan.c wavelan.p.h 
                         yellowfin.c 
        drivers/net/arcnet: arc-rimi.c com20020-isa.c com20020-pci.c 
                            com90io.c com90xx.c 
        drivers/net/tulip: tulip_core.c 
        drivers/net/wan: comx-hw-comx.c comx-hw-locomx.c 
                         comx-hw-mixcom.c comx-proto-fr.c 
                         comx-proto-lapb.c comx.c 
        drivers/net/wan/lmc: lmc_main.c 
        drivers/parport: ChangeLog daisy.c ieee1284.c ieee1284_ops.c 
                         parport_pc.c share.c 
        drivers/pci    : pci.ids 
        drivers/pcmcia : yenta.c 
        drivers/s390/block: dasd_proc.c 
        drivers/scsi   : BusLogic.c aha152x.c megaraid.c megaraid.h 
        drivers/sound  : ac97_codec.c cmpci.c es1370.c es1371.c 
                         esssolo1.c sb_card.c sonicvibes.c trident.c 
                         via82cxxx_audio.c 
        drivers/sound/dmasound: dmasound_awacs.c 
        drivers/sound/emu10k1: main.c 
        drivers/usb    : Config.in audio.c hub.c input.c ov511.c ov511.h 
                         pegasus.c printer.c uhci.c usb-ohci.c 
                         usb-ohci.h usb-storage.c usb-storage.h 
                         usb-uhci.c usb-uhci.h wacom.c 
        drivers/usb/serial: Makefile digi_acceleport.c ftdi_sio.c 
                            keyspan_pda.c omninet.c usbserial.c visor.c 
                            whiteheat.c 
        drivers/video  : cyber2000fb.c cyber2000fb.h 
        drivers/video/riva: fbdev.c 
        fs             : Makefile binfmt_aout.c buffer.c dcache.c exec.c 
                         inode.c namei.c pipe.c readdir.c super.c 
        fs/affs        : namei.c 
        fs/autofs      : dir.c dirhash.c 
        fs/autofs4     : root.c 
        fs/bfs         : dir.c 
        fs/coda        : cache.c dir.c psdev.c 
        fs/cramfs      : inode.c 
        fs/devfs       : base.c util.c 
        fs/ext2        : balloc.c namei.c 
        fs/hfs         : balloc.c catalog.c dir.c file_hdr.c hfs.h 
                         hfs_btree.h mdb.c part_tbl.c 
        fs/hpfs        : namei.c 
        fs/lockd       : clntproc.c svclock.c 
        fs/minix       : namei.c 
        fs/msdos       : namei.c 
        fs/ncpfs       : dir.c 
        fs/nfs         : dir.c inode.c nfs2xdr.c nfs3proc.c proc.c 
                         read.c write.c 
        fs/nfsd        : nfscache.c nfsfh.c 
        fs/openpromfs  : inode.c 
        fs/partitions  : check.c 
        fs/proc        : base.c generic.c kcore.c proc_devtree.c root.c 
        fs/qnx4        : namei.c 
        fs/ramfs       : inode.c 
        fs/smbfs       : dir.c file.c proc.c 
        fs/sysv        : namei.c 
        fs/udf         : namei.c 
        fs/ufs         : namei.c 
        fs/umsdos      : Makefile dir.c inode.c ioctl.c namei.c rdir.c 
        fs/vfat        : namei.c 
        include/asm-alpha: ide.h 
        include/asm-arm: hardirq.h softirq.h string.h unistd.h 
        include/asm-arm/arch-ebsa285: irq.h 
        include/asm-arm/proc-armv: locks.h 
        include/asm-i386: apicdef.h hw_irq.h ide.h uaccess.h 
        include/asm-ia64: ide.h 
        include/asm-ppc: bitops.h cpm_8260.h init.h page.h siginfo.h 
                         string.h 
        include/asm-sh : cache.h checksum.h ide.h io.h irq.h pgtable.h 
                         system.h unistd.h 
        include/asm-sparc: bitops.h ide.h irq.h pgalloc.h system.h 
                           winmacro.h 
        include/asm-sparc64: delay.h ide.h irq.h oplib.h processor.h 
                             system.h timer.h unistd.h 
        include/linux  : coda.h dcache.h elevator.h fb.h fs.h hdreg.h 
                         hdsmart.h ide.h if_pppox.h lvm.h mount.h 
                         netfilter_ipv6.h nfs_fs.h nfs_mount.h 
                         nfs_page.h nfs_xdr.h pci_ids.h proc_fs.h 
                         smb_fs.h smb_fs_i.h umsdos_fs.p usbdevice_fs.h 
                         vmalloc.h wait.h wrapper.h 
        include/linux/sunrpc: auth.h 
        init           : main.c 
        ipc            : shm.c util.c 
        kernel         : exec_domain.c fork.c ksyms.c 
        mm             : filemap.c highmem.c memory.c slab.c 
                         swap_state.c swapfile.c vmalloc.c vmscan.c 
        net            : Makefile 
        net/core       : dev.c skbuff.c 
        net/ipv4       : ip_gre.c ipip.c 
        net/ipv6       : Config.in 
        net/sunrpc     : auth.c 
        net/unix       : af_unix.c 
        scripts        : header.tk mkdep.c tail.tk tkgen.c tkparse.c 
        scripts/cramfs : mkcramfs.c 
Added files:
        Documentation  : kernel-doc-nano-HOWTO.txt 
        Documentation/DocBook: kernel-hacking.tmpl kernel-locking.tmpl 
        arch/ppc/mbxboot: gzimage.c rdimage.c vmlinux.lds 
        arch/sh/kernel : io_generic.c io_se.c irq_ipr.c setup_se.c 
        drivers/char   : tda7432.c tda9875.c tea6420.c 
        drivers/net    : stnic.c 
        include/asm-arm/arch-l7200: dma.h hardware.h ide.h io.h irq.h 
                                    irqs.h memory.h param.h processor.h 
                                    serial_l7200.h system.h time.h 
                                    timex.h uncompress.h vmalloc.h 
        include/asm-sh : hitachi_se.h smc37c93x.h 
        include/linux/netfilter_ipv6: ip6_tables.h 
        net/ipv6/netfilter: Config.in Makefile ip6_tables.c ip6t_MARK.c 
                            ip6t_limit.c ip6t_mark.c ip6table_filter.c 
Removed files:
        arch/arm/kernel: iic.c 
        arch/sh/kernel : irq_onchip.c 
        fs/umsdos      : check.c 
        include/asm-arm/proc-armo: semaphore.h 
        include/net    : slhc.h 

Log message:
        Merge with 2.3.99-pre9.