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/07/21 15:01:02

Modified files:
        .              : CREDITS MAINTAINERS Makefile README 
        Documentation  : Configure.help joystick-api.txt joystick.txt 
        Documentation/fb: 00-INDEX 
        Documentation/usb: ov511.txt usb-serial.txt 
        Documentation/video4linux/bttv: CARDLIST CONTRIBUTORS 
                                        Insmod-options 
        arch/alpha     : config.in 
        arch/alpha/boot: Makefile 
        arch/alpha/kernel: core_cia.c core_titan.c irq_alpha.c osf_sys.c 
                           pci.c setup.c sys_cabriolet.c sys_dp264.c 
                           sys_eb64p.c sys_noritake.c 
        arch/arm       : Makefile config.in vmlinux-armo.lds.in 
                         vmlinux-armv.lds.in 
        arch/arm/boot/compressed: Makefile head-sa1100.S 
        arch/arm/kernel: Makefile arch.c armksyms.c bios32.c dma-arc.c 
                         dma-footbridge.c dma-isa.c dma-rpc.c dma.c 
                         dma.h ecard.c hw-sa1100.c oldlatches.c 
                         process.c signal.c sys_arm.c time.c traps.c 
        arch/arm/lib   : Makefile 
        arch/arm/mm    : init.c mm-sa1100.c 
        arch/i386/boot : bootsect.S setup.S 
        arch/i386/kernel: acpi.c apm.c i8259.c io_apic.c irq.c traps.c 
        arch/i386/lib  : Makefile 
        arch/ia64/kernel: irq.c 
        arch/mips      : defconfig-cobalt 
        arch/mips/baget: vacserial.c 
        arch/ppc/kernel: pci.c pmac_backlight.c pmac_setup.c ppc_ksyms.c 
                         syscalls.c 
        arch/s390/kernel: irq.c 
        arch/sparc     : Makefile 
        arch/sparc/kernel: Makefile check_asm.sh irq.c sun4d_irq.c 
        arch/sparc/mm  : hypersparc.S swift.S tsunami.S viking.S 
        arch/sparc64   : Makefile 
        arch/sparc64/kernel: Makefile check_asm.sh sys_sparc32.c 
                             systbls.S 
        arch/sparc64/lib: blockops.S 
        arch/sparc64/solaris: socksys.c 
        drivers/acorn/block: fd1772.c 
        drivers/acorn/char: Makefile 
        drivers/atm    : zatm.c 
        drivers/block  : elevator.c floppy.c ll_rw_blk.c md.c raid1.c 
                         raid5.c 
        drivers/cdrom  : cdu31a.c cm206.c gscd.c mcd.c mcdx.c sbpcd.c 
                         sonycd535.c 
        drivers/char   : Makefile amiserial.c bt848.h bttv.h console.c 
                         epca.c istallion.c lp.c msp3400.c random.c 
                         serial.c stallion.c synclink.c tty_io.c tuner.c 
                         tvmixer.c videodev.c vt.c 
        drivers/char/drm: ffb_drv.c memory.c 
        drivers/char/ftape/lowlevel: ftape-tracing.h ftape_syms.c 
        drivers/char/ftape/zftape: zftape_syms.c 
        drivers/ide    : ide-cd.c 
        drivers/isdn   : isdn_tty.c 
        drivers/isdn/avmb1: avm_cs.c 
        drivers/mtd    : mtdram.c 
        drivers/net    : 3c523.c 3c527.c aironet4500_card.c defxx.c 
                         depca.c eepro.c hp100.c ibmlana.c sb1000.c 
                         sk_mca.c skeleton.c smc9194.c wavelan.c 
        drivers/net/appletalk: cops.c ipddp.c 
        drivers/net/fc : iph5526.c 
        drivers/net/hamradio: dmascc.c 
        drivers/net/hamradio/soundmodem: sm_sbc.c sm_wss.c 
        drivers/net/pcmcia: aironet4500_cs.c com20020_cs.c ray_cs.c 
        drivers/net/tokenring: ibmtr.c lanstreamer.c olympic.c smctr.c 
        drivers/s390/char: con3215.c 
        drivers/sbus/audio: audio.c 
        drivers/sbus/char: flash.c openprom.c pcikbd.c rtc.c vfc_dev.c 
        drivers/scsi   : scsi_scan.c sr.c 
        drivers/sound  : cmpci.c es1370.c es1371.c esssolo1.c maestro.c 
                         nm256_audio.c sonicvibes.c 
        drivers/usb    : Config.in microtek.c ov511.c usb.c 
        drivers/usb/serial: keyspan.c keyspan_usa28msg.h 
        drivers/video  : aty128fb.c cyber2000fb.c fbmem.c pm2fb.c 
                         sa1100fb.c sisfb.c vesafb.c 
        drivers/video/matrox: matroxfb_base.c 
        fs             : binfmt_elf.c buffer.c namei.c select.c 
        fs/ext2        : file.c super.c 
        fs/fat         : dir.c inode.c 
        fs/hpfs        : buffer.c 
        fs/isofs       : inode.c joliet.c 
        fs/jffs        : jffs_fm.c 
        fs/msdos       : namei.c 
        fs/ncpfs       : ncplib_kernel.c 
        fs/nfsd        : nfssvc.c stats.c 
        fs/nls         : Config.in Makefile nls_base.c nls_cp437.c 
                         nls_cp737.c nls_cp775.c nls_cp850.c nls_cp852.c 
                         nls_cp855.c nls_cp857.c nls_cp860.c nls_cp861.c 
                         nls_cp862.c nls_cp863.c nls_cp864.c nls_cp865.c 
                         nls_cp866.c nls_cp869.c nls_cp874.c 
                         nls_iso8859-1.c nls_iso8859-14.c 
                         nls_iso8859-15.c nls_iso8859-2.c 
                         nls_iso8859-3.c nls_iso8859-4.c nls_iso8859-5.c 
                         nls_iso8859-6.c nls_iso8859-7.c nls_iso8859-8.c 
                         nls_iso8859-9.c nls_koi8-r.c 
        fs/ntfs        : fs.c support.c 
        fs/partitions  : Makefile msdos.c 
        fs/qnx4        : inode.c 
        fs/smbfs       : Makefile cache.c dir.c file.c inode.c ioctl.c 
                         proc.c sock.c 
        fs/vfat        : namei.c 
        include/asm-alpha: pci.h 
        include/asm-arm: dec21285.h dma.h system.h unaligned.h 
        include/asm-arm/arch-arc: dma.h hardware.h ide.h oldlatches.h 
                                  system.h 
        include/asm-arm/arch-cl7500: dma.h system.h 
        include/asm-arm/arch-ebsa110: dma.h system.h 
        include/asm-arm/arch-ebsa285: system.h 
        include/asm-arm/arch-l7200: dma.h system.h 
        include/asm-arm/arch-nexuspci: dma.h system.h 
        include/asm-arm/arch-rpc: dma.h system.h 
        include/asm-arm/arch-sa1100: dma.h hardware.h ide.h io.h irq.h 
                                     keyboard.h system.h uncompress.h 
        include/asm-arm/arch-shark: system.h 
        include/asm-i386: hardirq.h 
        include/asm-ia64: hardirq.h ia32.h pgtable.h 
        include/asm-mips: hardirq.h 
        include/asm-ppc: hardirq.h machdep.h 
        include/asm-sparc: bitops.h pgtsrmmu.h 
        include/linux  : acpi.h coda_linux.h elevator.h fs.h 
                         hfs_sysdep.h msdos_fs_sb.h ncp_fs.h nls.h pm.h 
                         slab.h smb_fs.h timer.h 
        include/linux/nfsd: stats.h 
        include/linux/raid: md.h 
        include/net    : sock.h 
        kernel         : sys.c timer.c 
        mm             : page_alloc.c vmscan.c 
        net            : socket.c 
        net/802        : p8022.c p8023.c psnap.c tr.c 
        net/appletalk  : aarp.c ddp.c 
        net/core       : dev_mcast.c netfilter.c sock.c 
        net/decnet     : dn_dev.c dn_table.c 
        net/ethernet   : pe2.c 
        net/ipv4       : devinet.c igmp.c ip_options.c ip_sockglue.c 
                         ipconfig.c syncookies.c tcp_ipv4.c 
        net/ipv4/netfilter: ipfwadm_core.c ipt_REJECT.c 
        net/ipv6       : mcast.c 
        net/ipx        : af_ipx.c 
        net/packet     : af_packet.c 
        net/sunrpc     : xprt.c 
        net/unix       : af_unix.c 
Added files:
        Documentation/i386: boot.txt 
        arch/arm/boot/compressed: setup-sa1100.S 
        drivers/char   : bttv-cards.c bttv-driver.c bttv-if.c 
        drivers/usb/serial: keyspan.h 
        fs/nls         : nls_big5.c nls_cp932.c nls_cp936.c nls_cp949.c 
                         nls_cp950.c nls_euc-jp.c nls_euc-kr.c 
                         nls_gb2312.c nls_sjis.c nls_utf8.c 
        fs/smbfs       : ChangeLog smb_debug.h 
        include/asm-arm/arch-sa1100: SA-1100.h SA-1101.h SA-1111.h 
                                     bitfield.h bitsy.h thinclient.h 
Removed files:
        arch/arm/kernel: dma-a5k.c dma-dummy.c dma-isa.h 
        drivers/char   : bttv.c 
        include/asm-sparc: asm_offsets.h 
        include/asm-sparc64: asm_offsets.h 

Log message:
        Merge with Linux 2.4.0-test5-pre3.