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 05:37:19

Modified files:
        .              : CREDITS MAINTAINERS Makefile 
        Documentation  : DMA-mapping.txt IO-mapping.txt computone.txt 
                         cpqarray.txt floppy.txt highuid.txt 
                         joystick-api.txt joystick-parport.txt 
                         joystick.txt md.txt moxa-smartio mtrr.txt 
                         nmi_watchdog.txt stallion.txt sysrq.txt 
        Documentation/arm/SA1100: ThinClient 
        Documentation/arm/empeg: ir.txt 
        Documentation/arm/nwfpe: README 
        Documentation/cdrom: cdrom-standard.tex ide-cd 
        Documentation/fb: aty128fb.txt matroxfb.txt vesafb.txt 
        Documentation/filesystems: Locking affs.txt coda.txt fat_cvf.txt 
                                   hpfs.txt proc.txt ufs.txt vfs.txt 
        Documentation/i2c: dev-interface i2c-protocol writing-clients 
        Documentation/ia64: README efirtc.txt 
        Documentation/isdn: 00-INDEX INTERFACE.fax README README.HiSax 
                            README.act2000 README.avmb1 README.concap 
                            README.diversion README.hysdn README.icn 
                            README.sc 
        Documentation/kbuild: commands.txt config-language.txt 
        Documentation/m68k: README.buddha kernel-options.txt 
        Documentation/networking: README.sb1000 comx.txt cs89x0.txt 
                                  decnet.txt dmfe.txt ethertap.txt 
                                  ip-sysctl.txt ipddp.txt iphase.txt 
                                  olympic.txt shaper.txt sis900.txt 
                                  sk98lin.txt smctr.txt tlan.txt 
                                  tms380tr.txt tulip.txt vortex.txt 
                                  wan-router.txt wanpipe.txt wavelan.txt 
        Documentation/powerpc: SBC8260_memory_mapping.txt 
        Documentation/s390: DASD cds.txt 
        Documentation/sound: CMI8338 ESS Introduction Maestro PSS 
                             README.OSS README.modules README.ymfsb 
        Documentation/sysctl: vm.txt 
        Documentation/usb: CREDITS URB.txt input.txt ohci.txt ov511.txt 
                           proc_usb_info.txt scanner.txt uhci.txt 
                           usb-serial.txt 
        Documentation/video4linux: CQcam.txt README.cpia radiotrack.txt 
                                   zr36120.txt 
        Documentation/vm: numa 
        arch/alpha/kernel: entry.S 
        arch/i386      : Makefile config.in defconfig 
        arch/i386/boot/compressed: misc.c 
        arch/i386/kernel: microcode.c 
        drivers/char   : Makefile n_tty.c 
        drivers/char/drm: agpsupport.c auth.c memory.c r128_bufs.c 
                          r128_drv.c tdfx_drv.c 
        drivers/i2c    : Config.in 
        drivers/ide    : pdc202xx.c 
        drivers/net    : acenic.c gmac.c 
        drivers/pci    : quirks.c 
        drivers/scsi   : README.ibmmca ibmmca.c ibmmca.h scsi.c sg.c 
        drivers/sound  : Makefile 
        drivers/usb    : acm.c audio.c dabusb.c dsbr100.c evdev.c hid.c 
                         ibmcam.c iforce.c input.c joydev.c keybdev.c 
                         microtek.c mousedev.c ov511.c pegasus.c 
                         printer.c rio500.c uhci.c usb-ohci.c usb-uhci.c 
                         usbkbd.c usbmouse.c wacom.c 
        drivers/usb/serial: Makefile digi_acceleport.c ftdi_sio.c 
                            keyspan.c keyspan_pda.c visor.c whiteheat.c 
        drivers/usb/storage: Makefile scsiglue.c scsiglue.h transport.c 
                             transport.h usb.c 
        drivers/video/riva: fbdev.c 
        fs             : binfmt_elf.c binfmt_misc.c binfmt_script.c 
                         buffer.c dcache.c devices.c exec.c 
        fs/ext2        : balloc.c file.c inode.c super.c 
        fs/fat         : dir.c 
        fs/vfat        : namei.c 
        include/asm-alpha: cache.h 
        include/linux  : arcdevice.h binfmts.h module.h sched.h 
                         spinlock.h 
        include/scsi   : sg.h 
        kernel         : Makefile exit.c fork.c sys.c 
        mm             : numa.c 
        net            : socket.c 
        net/ipv6/netfilter: ip6table_filter.c 
Added files:
        drivers/char/drm: drm_syms.c 
        drivers/usb/storage: sddr09.c sddr09.h shuttle_usbat.c 
                             shuttle_usbat.h 
        kernel         : user.c 
Removed files:
        drivers/usb/storage: scm.c scm.h 

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