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/08 19:54:56

Modified files:
        arch/i386      : config.in 
        arch/i386/kernel: apm.c 
        arch/i386/lib  : Makefile 
        arch/mips/kernel: syscall.c 
        arch/sparc/kernel: signal.c 
        arch/sparc64/kernel: signal.c signal32.c 
        drivers/atm    : ambassador.c eni.c eni.h fore200e.c horizon.c 
                         idt77105.c nicstar.c nicstar.h 
        drivers/block  : lvm.c md.c raid0.c raid1.c raid5.c 
        drivers/ide    : piix.c 
        drivers/net    : 3c509.c 3c515.c 
        drivers/scsi   : NCR5380.c atp870u.c seagate.c 
        drivers/sound  : os.h 
        fs             : binfmt_aout.c dcache.c file.c inode.c namei.c 
                         open.c 
        fs/proc        : proc_misc.c 
        include/linux  : dcache.h fs.h slab.h spinlock.h 
        include/linux/sunrpc: sched.h xprt.h 
        init           : main.c 
        kernel         : fork.c ksyms.c sys.c 
        lib            : Makefile 
        mm             : slab.c 
        net/atm        : Makefile clip.c common.c common.h ipcommon.c 
                         ipcommon.h lec.c mpc.c proc.c signaling.c 
                         signaling.h svc.c 
        net/ipv4       : ip_gre.c ipip.c 
        net/ipv4/netfilter: ip_conntrack_core.c ip_conntrack_ftp.c 
                            ip_fw_compat.c ip_nat_core.c ip_nat_ftp.c 
                            ip_nat_standalone.c ip_queue.c 
                            ipt_MASQUERADE.c ipt_MIRROR.c ipt_mac.c 
        net/ipv6       : sit.c 
        net/sunrpc     : clnt.c sched.c svcsock.c xprt.c 
Added files:
        arch/i386/lib  : dec_and_lock.c 
        lib            : dec_and_lock.c 

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