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/07 17:53:09

Modified files:
        .              : MAINTAINERS Makefile 
        Documentation  : Configure.help kernel-docs.txt 
        Documentation/DocBook: kernel-locking.tmpl 
        Documentation/fb: matroxfb.txt 
        Documentation/filesystems/devfs: ChangeLog README 
        arch/alpha     : config.in 
        arch/alpha/kernel: osf_sys.c 
        arch/arm       : config.in 
        arch/arm/kernel: sys_arm.c 
        arch/i386      : config.in defconfig vmlinux.lds 
        arch/i386/boot : setup.S 
        arch/i386/boot/compressed: head.S misc.c 
        arch/i386/kernel: Makefile apic.c head.S i8259.c io_apic.c 
                          process.c sys_i386.c 
        arch/i386/math-emu: poly_tan.c 
        arch/ia64      : config.in 
        arch/ia64/ia32 : sys_ia32.c 
        arch/ia64/kernel: sys_ia64.c 
        arch/m68k      : config.in 
        arch/m68k/kernel: sys_m68k.c 
        arch/mips      : config.in defconfig defconfig-cobalt 
                         defconfig-decstation defconfig-ip22 
                         defconfig-rm200 
        arch/mips/baget: vacserial.c 
        arch/mips/kernel: irixelf.c syscall.c sysirix.c 
        arch/mips64    : config.in defconfig defconfig-ip22 
                         defconfig-ip27 
        arch/mips64/kernel: head.S linux32.c syscall.c 
        arch/mips64/lib: dump_tlb.c 
        arch/mips64/mm : fault.c 
        arch/mips64/sgi-ip27: ip27-berr.c ip27-irq.c 
        arch/ppc       : config.in 
        arch/ppc/8260_io: uart.c 
        arch/ppc/8xx_io: uart.c 
        arch/ppc/kernel: syscalls.c 
        arch/s390      : config.in 
        arch/s390/kernel: sys_s390.c 
        arch/sh        : config.in 
        arch/sh/kernel : sys_sh.c 
        arch/sparc     : config.in 
        arch/sparc/kernel: sys_sparc.c sys_sunos.c 
        arch/sparc/mm  : srmmu.c 
        arch/sparc64   : config.in defconfig 
        arch/sparc64/kernel: irq.c pci_sabre.c sys_sparc.c sys_sparc32.c 
                             sys_sunos32.c 
        arch/sparc64/mm: modutil.c 
        arch/sparc64/solaris: fs.c misc.c 
        drivers        : Makefile 
        drivers/acorn/block: fd1772.c 
        drivers/block  : acsi_slm.c ataflop.c cpqarray.c elevator.c 
                         floppy.c ll_rw_blk.c loop.c md.c nbd.c 
                         ps2esdi.c rd.c xd.c xd.h z2ram.c 
        drivers/block/paride: pg.c pt.c 
        drivers/cdrom  : aztcd.c cdrom.c cdu31a.c cm206.c gscd.c gscd.h 
                         mcd.c mcd.h mcdx.c optcd.c sbpcd.c sjcd.c 
                         sonycd535.c 
        drivers/char   : console.c epca.c ip2main.c istallion.c lp.c 
                         misc.c msp3400.c nwbutton.h pcxx.c ppdev.c 
                         pty.c rocket.c serial.c specialix.c stallion.c 
                         stradis.c synclink.c tpqic02.c tty_io.c 
                         vc_screen.c videodev.c zr36120.c 
        drivers/char/ftape/zftape: zftape-init.c 
        drivers/char/ip2: i2ellis.c i2ellis.h i2lib.c i2lib.h i2os.h 
        drivers/i2o    : i2o_block.c 
        drivers/ide    : hd.c ide-cd.c ide-probe.c ide.c 
        drivers/ieee1394: Config.in Makefile aic5800.c csr.c guid.c 
                          highlevel.c hosts.c ieee1394_core.c 
                          ieee1394_core.h ieee1394_syms.c 
                          ieee1394_transactions.c ieee1394_types.h 
                          ohci1394.c ohci1394.h pcilynx.c pcilynx.h 
                          raw1394.c raw1394.h video1394.h 
        drivers/isdn   : isdn_common.c 
        drivers/isdn/avmb1: capi.c 
        drivers/net    : Space.c atp.c bonding.c cs89x0.c defxx.c 
                         ncr885e.c sk_g16.c smc9194.c sunlance.c 
        drivers/net/appletalk: ltpc.c 
        drivers/net/hamradio: baycom_par.c baycom_ser_fdx.c 
                              baycom_ser_hdx.c 
        drivers/net/hamradio/soundmodem: sm.c 
        drivers/net/irda: nsc-ircc.c smc-ircc.c 
        drivers/net/pcmcia: aironet4500_cs.c 
        drivers/net/sk98lin: skvpd.c 
        drivers/net/skfp: ecm.c ess.c fplustm.c smt.c srf.c 
        drivers/net/tokenring: ibmtr.c 
        drivers/net/wan: comx-proto-lapb.c cosa.c hostess_sv11.c 
        drivers/net/wan/lmc: lmc_main.c 
        drivers/parport: ChangeLog parport_pc.c procfs.c 
        drivers/pcmcia : cs.c cs_internal.h pci_socket.c pci_socket.h 
        drivers/sbus/audio: audio.c 
        drivers/sbus/char: bpp.c jsflash.c sab82532.c vfc_dev.c zs.c 
        drivers/scsi   : gdth_proc.c scsi.c scsi_lib.c scsi_scan.c 
        drivers/sgi/char: sgiserial.c 
        drivers/sound  : cmpci.c esssolo1.c sb_common.c sonicvibes.c 
                         sound_core.c sound_syms.c soundcard.c sscape.c 
        drivers/tc     : zs.c 
        drivers/usb    : devio.c ibmcam.c input.c usb-ohci.c usb-ohci.h 
                         usb-uhci.c 
        drivers/usb/serial: usbserial.c visor.c whiteheat.c 
        drivers/video  : Config.in atyfb.c clgenfb.c fbmem.c offb.c 
                         tdfxfb.c 
        drivers/video/matrox: matroxfb_DAC1064.c matroxfb_DAC1064.h 
                              matroxfb_Ti3026.c matroxfb_base.c 
                              matroxfb_base.h matroxfb_crtc2.c 
        drivers/video/riva: fbdev.c riva_hw.c riva_tbl.h 
        fs             : Config.in Makefile block_dev.c dcache.c 
                         devices.c dquot.c exec.c file_table.c locks.c 
                         namei.c open.c pipe.c readdir.c stat.c super.c 
        fs/affs        : symlink.c 
        fs/autofs      : root.c 
        fs/autofs4     : expire.c root.c 
        fs/coda        : cache.c dir.c pioctl.c psdev.c symlink.c 
        fs/devfs       : base.c util.c 
        fs/efs         : symlink.c 
        fs/ext2        : super.c 
        fs/hfs         : sysdep.c 
        fs/hpfs        : namei.c 
        fs/isofs       : rock.c 
        fs/ncpfs       : dir.c file.c inode.c ncplib_kernel.c 
                         ncplib_kernel.h sock.c 
        fs/nfs         : dir.c inode.c symlink.c 
        fs/nfsd        : nfsfh.c 
        fs/ntfs        : Makefile fs.c 
        fs/partitions  : check.c 
        fs/proc        : base.c 
        fs/ramfs       : inode.c 
        fs/smbfs       : dir.c inode.c 
        fs/udf         : symlink.c 
        fs/umsdos      : dir.c inode.c 
        fs/vfat        : namei.c 
        include/asm-alpha: fcntl.h 
        include/asm-arm: fcntl.h 
        include/asm-i386: bugs.h fcntl.h io_apic.h socket.h spinlock.h 
        include/asm-ia64: fcntl.h 
        include/asm-m68k: fcntl.h 
        include/asm-mips: fcntl.h floppy.h 
        include/asm-mips64: fcntl.h floppy.h page.h 
        include/asm-ppc: fcntl.h 
        include/asm-s390: fcntl.h 
        include/asm-sh : fcntl.h 
        include/asm-sparc: fcntl.h 
        include/asm-sparc64: fcntl.h irq.h 
        include/linux  : blk.h blkdev.h dcache.h devfs_fs_kernel.h fs.h 
                         fs_struct.h init.h matroxfb.h ncp_fs_sb.h 
                         netdevice.h quotaops.h sched.h timer.h 
                         tpqic02.h tty.h usbdevice_fs.h 
        ipc            : shm.c 
        kernel         : acct.c exit.c fork.c kmod.c ksyms.c printk.c 
                         sched.c timer.c 
        mm             : filemap.c vmscan.c 
        net            : Makefile socket.c 
        net/bridge     : br_input.c 
        net/ipx        : af_ipx.c 
        net/khttpd     : security.c 
        net/netlink    : af_netlink.c netlink_dev.c 
        net/unix       : af_unix.c 
        scripts        : kernel-doc 
Added files:
        drivers/acpi   : .cvsignore Makefile osd.c 
        drivers/acpi/common: cmalloc.c cmcopy.c cmdebug.c cmdelete.c 
                             cmeval.c cmglobal.c cminit.c cmobject.c 
                             cmutils.c cmxface.c 
        drivers/acpi/dispatcher: dsfield.c dsmethod.c dsmthdat.c 
                                 dsobject.c dsopcode.c dsutils.c 
                                 dswexec.c dswload.c dswscope.c 
                                 dswstate.c 
        drivers/acpi/events: evevent.c evmisc.c evregion.c evrgnini.c 
                             evsci.c evxface.c evxfevnt.c evxfregn.c 
        drivers/acpi/hardware: hwacpi.c hwcpu32.c hwgpe.c hwregs.c 
                               hwxface.c 
        drivers/acpi/include: acenv.h acexcep.h acobject.h acpi.h 
                              acpiosxf.h acpixf.h actables.h actbl32.h 
                              actbl64.h actypes.h amlcode.h common.h 
                              config.h debugger.h dispatch.h events.h 
                              globals.h hardware.h internal.h interp.h 
                              macros.h namesp.h output.h parser.h 
                              resource.h tables.h 
        drivers/acpi/interpreter: amconfig.c amcreate.c amdyadic.c 
                                  amfield.c amfldio.c ammisc.c ammonad.c 
                                  amnames.c amprep.c amregion.c 
                                  amresnte.c amresolv.c amresop.c 
                                  amstore.c amstoren.c amstorob.c 
                                  amsystem.c amutils.c amxface.c 
        drivers/acpi/namespace: nsaccess.c nsalloc.c nseval.c nsload.c 
                                nsnames.c nsobject.c nssearch.c 
                                nsutils.c nswalk.c nsxfname.c nsxfobj.c 
        drivers/acpi/parser: psargs.c psopcode.c psparse.c psscope.c 
                             pstree.c psutils.c pswalk.c psxface.c 
        drivers/acpi/resources: rsaddr.c rscalc.c rscreate.c rsdump.c 
                                rsio.c rsirq.c rslist.c rsmemory.c 
                                rsmisc.c rsutils.c rsxface.c 
        drivers/acpi/tables: tbget.c tbinstal.c tbtable.c tbutils.c 
                             tbxface.c 
        drivers/ieee1394: video1394.c 
        drivers/mtd    : .cvsignore Config.in Makefile cfi_cmdset_0001.c 
                         cfi_probe.c doc1000.c doc2000.c doc2001.c 
                         docprobe.c ftl.c jedec.c map_ram.c map_rom.c 
                         mapped.c mixmem.c mtdblock.c mtdchar.c 
                         mtdcore.c mtdram.c nftl.c nora.c octagon-5066.c 
                         physmap.c pmc551.c rpxlite.c slram.c vmax301.c 
        fs/jffs        : .cvsignore Makefile inode-v23.c intrep.c 
                         intrep.h jffs_fm.c jffs_fm.h 
        include/linux  : jffs.h 
        include/linux/mtd: cfi.h compatmac.h doc2000.h flashchip.h ftl.h 
                           iflash.h jedec.h map.h mapped.h mtd.h nand.h 
                           nftl.h pmc551.h 
Removed files:
        arch/alpha     : vmlinux.lds 

Log message:
        Merge with 2.4.0-test3-pre4.