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/24 18:20:07

Modified files:
        .              : MAINTAINERS Makefile Rules.make 
        Documentation  : Configure.help cpqarray.txt ioctl-number.txt 
                         joystick-parport.txt joystick.txt 
        Documentation/filesystems: vfs.txt 
        Documentation/filesystems/devfs: ChangeLog README modules.conf 
        arch/alpha/kernel: core_mcpcia.c core_titan.c irq.c 
                           machvec_impl.h pci.c pci_iommu.c sys_dp264.c 
        arch/i386      : defconfig 
        arch/i386/kernel: Makefile entry.S i386_ksyms.c i8259.c 
                          microcode.c mtrr.c pci-i386.h pci-irq.c 
                          pci-pc.c pci-visws.c process.c ptrace.c 
                          setup.c signal.c traps.c vm86.c 
        arch/i386/math-emu: fpu_entry.c 
        arch/ia64      : Makefile config.in defconfig vmlinux.lds.S 
        arch/ia64/boot : Makefile 
        arch/ia64/dig  : iosapic.c setup.c 
        arch/ia64/hp   : hpsim_irq.c 
        arch/ia64/ia32 : binfmt_elf32.c ia32_entry.S ia32_signal.c 
                         ia32_support.c ia32_traps.c sys_ia32.c 
        arch/ia64/kernel: Makefile acpi.c efi.c efi_stub.S entry.S 
                          entry.h fw-emu.c gate.S head.S irq.c 
                          irq_ia64.c ivt.S mca.c mca_asm.S minstate.h 
                          pal.S pci-dma.c pci.c process.c ptrace.c 
                          setup.c signal.c smp.c sys_ia64.c time.c 
                          traps.c unaligned.c unwind.c 
        arch/ia64/lib  : Makefile clear_page.S clear_user.S copy_page.S 
                         copy_user.S do_csum.S flush.S idiv.S memset.S 
                         strlen.S strlen_user.S strncpy_from_user.S 
                         strnlen_user.S 
        arch/ia64/mm   : fault.c init.c tlb.c 
        arch/ia64/tools: Makefile print_offsets.c 
        arch/m68k/atari: joystick.c 
        arch/mips      : defconfig defconfig-decstation defconfig-ip22 
                         defconfig-rm200 
        arch/mips64    : defconfig defconfig-ip22 defconfig-ip27 
        arch/sparc     : config.in 
        arch/sparc/kernel: ebus.c ioport.c pcic.c sys_sparc.c 
                           sys_sunos.c 
        arch/sparc/mm  : srmmu.c 
        arch/sparc64   : config.in 
        arch/sparc64/kernel: sys_sparc.c sys_sparc32.c sys_sunos32.c 
        arch/sparc64/solaris: socksys.c 
        drivers/block  : DAC960.c acsi_slm.c cpqarray.c elevator.c 
                         floppy.c ida_cmd.h ll_rw_blk.c loop.c md.c 
                         nbd.c rd.c smart1,2.h 
        drivers/block/paride: pg.c pt.c 
        drivers/cdrom  : aztcd.c cdrom.c gscd.c optcd.c sbpcd.c sjcd.c 
                         sonycd535.c 
        drivers/char   : applicom.c dsp56k.c dtlk.c i2c-old.c ip2main.c 
                         istallion.c lp.c mem.c misc.c ppdev.c 
                         stallion.c tpqic02.c tty_io.c vc_screen.c 
                         videodev.c 
        drivers/char/ftape/zftape: zftape-init.c 
        drivers/char/joystick: Config.in Makefile 
        drivers/ide    : ide-cd.c ide-tape.c ide.c 
        drivers/isdn   : isdn_common.c 
        drivers/isdn/avmb1: capi.c 
        drivers/macintosh: adb.c 
        drivers/net    : Config.in dmfe.c dummy.c ppp_generic.c 
        drivers/net/irda: irport.c irtty.c nsc-ircc.c toshoboe.c 
                          w83977af_ir.c 
        drivers/net/wan: cosa.c 
        drivers/pcmcia : yenta.c 
        drivers/pnp    : isapnp.c 
        drivers/s390/block: dasd.c 
        drivers/sbus/audio: audio.c 
        drivers/sbus/char: bpp.c jsflash.c sunkbd.c vfc_dev.c 
        drivers/scsi   : aic7xxx.c aic7xxx.h aic7xxx_proc.c 
                         aic7xxx_seq.c scsi.c scsi_lib.c scsi_scan.c 
                         sg.c sr.c st.c 
        drivers/scsi/aic7xxx: aic7xxx.seq 
        drivers/sgi/char: shmiq.c 
        drivers/sound  : sound_core.c soundcard.c 
        drivers/telephony: ixj.h 
        drivers/usb    : Config.in Makefile devio.c evdev.c input.c 
                         joydev.c mousedev.c pegasus.c usb-storage.c 
                         usb-storage.h 
        drivers/usb/serial: usbserial.c visor.c 
        drivers/video  : Config.in fbmem.c sisfb.c 
        fs             : Config.in binfmt_aout.c binfmt_elf.c 
                         binfmt_em86.c binfmt_misc.c binfmt_script.c 
                         block_dev.c buffer.c exec.c fcntl.c 
                         file_table.c filesystems.c inode.c ioctl.c 
                         locks.c namei.c pipe.c readdir.c select.c 
                         super.c 
        fs/adfs        : adfs.h inode.c 
        fs/affs        : inode.c 
        fs/bfs         : inode.c 
        fs/coda        : dir.c file.c psdev.c 
        fs/devfs       : base.c util.c 
        fs/ext2        : balloc.c dir.c file.c fsync.c ialloc.c inode.c 
                         namei.c super.c truncate.c 
        fs/fat         : inode.c 
        fs/hpfs        : file.c hpfs_fn.h inode.c namei.c 
        fs/lockd       : clntlock.c svclock.c 
        fs/minix       : bitmap.c fsync.c inode.c 
        fs/ncpfs       : dir.c file.c inode.c ioctl.c mmap.c 
                         ncplib_kernel.c ncplib_kernel.h symlink.c 
        fs/nfs         : file.c 
        fs/nfsd        : nfsctl.c nfssvc.c vfs.c 
        fs/ntfs        : Makefile fs.c 
        fs/partitions  : check.c 
        fs/proc        : base.c generic.c proc_misc.c 
        fs/qnx4        : fsync.c inode.c 
        fs/ramfs       : inode.c 
        fs/smbfs       : file.c 
        fs/sysv        : fsync.c ialloc.c inode.c 
        fs/udf         : fsync.c inode.c super.c udfdecl.h 
        fs/ufs         : inode.c 
        fs/umsdos      : inode.c 
        include/asm-alpha: cache.h pci.h string.h unaligned.h 
        include/asm-arm: pci.h 
        include/asm-i386: bugs.h elf.h io_apic.h pci.h processor.h 
                          ptrace.h sigcontext.h user.h 
        include/asm-ia64: dma.h ia32.h iosapic.h offsets.h page.h pal.h 
                          pci.h pgtable.h processor.h ptrace.h 
                          ptrace_offsets.h sal.h siginfo.h spinlock.h 
                          stat.h string.h system.h unistd.h unwind.h 
        include/asm-m68k: pci.h 
        include/asm-mips: pci.h 
        include/asm-mips64: pci.h 
        include/asm-ppc: byteorder.h pci.h 
        include/asm-sh : pci.h 
        include/asm-sparc: pci.h 
        include/asm-sparc64: pci.h 
        include/linux  : affs_fs.h blk.h blkdev.h devfs_fs_kernel.h 
                         elevator.h elf.h elfcore.h ext2_fs.h fb.h fs.h 
                         input.h irq.h joystick.h linkage.h minix_fs.h 
                         mm.h mount.h msdos_fs.h ncp_fs_i.h pci_ids.h 
                         poll.h qnx4_fs.h swap.h sysv_fs.h timer.h 
                         types.h ufs_fs.h umsdos_fs.p 
        include/linux/nfsd: syscall.h 
        include/net    : dn.h if_inet6.h 
        init           : main.c 
        ipc            : shm.c util.c util.h 
        kernel         : dma.c exec_domain.c exit.c fork.c ksyms.c 
                         sched.c sysctl.c timer.c 
        mm             : filemap.c memory.c mmap.c page_alloc.c 
                         swap_state.c swapfile.c vmscan.c 
        net            : netsyms.c 
        net/core       : profile.c 
        net/decnet     : af_decnet.c dn_neigh.c dn_route.c 
        net/ipv4       : fib_semantics.c icmp.c igmp.c ipconfig.c 
        net/ipv6       : ip6_output.c mcast.c 
        net/netlink    : netlink_dev.c 
        net/sched      : sch_api.c 
        net/unix       : af_unix.c 
Added files:
        arch/i386/kernel: i387.c 
        arch/ia64/kernel: brl_emu.c ia64_ksyms.c palinfo.c 
                          unwind_decoder.c unwind_i.h 
        arch/ia64/lib  : io.c 
        drivers/char/joystick: a3d.c adi.c amijoy.c analog.c cobra.c 
                               db9.c gamecon.c gameport.c gf2k.c grip.c 
                               interact.c lightning.c magellan.c ns558.c 
                               pcigame.c serio.c serport.c sidewinder.c 
                               spaceball.c spaceorb.c tmdc.c 
                               turbografx.c warrior.c 
        drivers/usb    : iforce.c 
        include/asm-i386: i387.h 
        include/asm-ia64: asmmacro.h 
        include/linux  : gameport.h serio.h 
Removed files:
        arch/ia64/kernel: sal_stub.S 
        drivers/char/joystick: joy-amiga.c joy-analog.c joy-analog.h 
                               joy-assassin.c joy-console.c 
                               joy-creative.c joy-db9.c joy-gravis.c 
                               joy-lightning.c joy-logitech.c 
                               joy-magellan.c joy-pci.c joy-sidewinder.c 
                               joy-spaceball.c joy-spaceorb.c 
                               joy-thrustmaster.c joy-turbografx.c 
                               joy-warrior.c joystick.c 
        drivers/usb    : wmforce.c 

Log message:
        Merge with Linux 2.4.0-test2.