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/08 11:02:02

Modified files:
        .              : MAINTAINERS Makefile 
        arch/i386      : config.in defconfig 
        arch/i386/kernel: irq.c 
        drivers/char   : keyboard.c sysrq.c 
        drivers/char/drm: Config.in Makefile drmP.h gamma_drv.c 
                          i810_context.c i810_dma.c i810_drv.c 
                          mga_context.c mga_drv.c r128_context.c 
                          r128_drv.c tdfx_context.c tdfx_drv.c vm.c 
        drivers/ide    : ide-features.c ide-probe.c 
        drivers/net/pcmcia: ray_cs.c 
        drivers/pci    : pci.ids 
        drivers/pcmcia : Makefile yenta.c 
        drivers/sbus/char: sunkbd.c 
        drivers/usb    : bluetooth.c usb-uhci.c usb.c 
        drivers/usb/storage: protocol.c protocol.h scsiglue.c sddr09.c 
                             sddr09.h transport.c usb.c usb.h 
        fs             : buffer.c dcache.c exec.c namei.c stat.c 
        fs/autofs4     : root.c 
        fs/ext2        : ialloc.c inode.c ioctl.c 
        fs/nfs         : inode.c 
        fs/umsdos      : emd.c inode.c ioctl.c namei.c 
        include/asm-alpha: fpu.h 
        include/asm-arm: stat.h 
        include/asm-i386: stat.h system.h 
        include/asm-ia64: system.h 
        include/asm-m68k: stat.h system.h 
        include/asm-mips: system.h 
        include/asm-mips64: system.h 
        include/asm-ppc: stat.h system.h 
        include/asm-s390: stat.h system.h 
        include/asm-sh : system.h 
        include/asm-sparc: stat.h system.h 
        include/asm-sparc64: stat.h system.h 
        include/linux  : fs.h list.h sysrq.h umsdos_fs.p usb.h 
        kernel         : kmod.c sched.c softirq.c sysctl.c 
        mm             : filemap.c highmem.c page_alloc.c swapfile.c 

Log message:
        Merge with Linux 2.4.0-test6-pre2.