Merge with Linux 2.4.0-pre3-test6.
commit493c987f7a352ca64fdb4dc03a21e24cbaf46f55
authorRalf Baechle <ralf@linux-mips.org>
Sun, 9 Jul 2000 02:54:55 +0000 (9 02:54 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 9 Jul 2000 02:54:55 +0000 (9 02:54 +0000)
tree184cddc0925e082c0500afd042f92e9f340fe890
parent2d25612a92c62b5708d6d43f38d28c6141173328
Merge with Linux 2.4.0-pre3-test6.
77 files changed:
arch/i386/config.in
arch/i386/kernel/apm.c
arch/i386/lib/Makefile
arch/i386/lib/dec_and_lock.c [new file with mode: 0644]
arch/mips/kernel/syscall.c
arch/sparc/kernel/signal.c
arch/sparc64/kernel/signal.c
arch/sparc64/kernel/signal32.c
drivers/atm/ambassador.c
drivers/atm/eni.c
drivers/atm/eni.h
drivers/atm/fore200e.c
drivers/atm/horizon.c
drivers/atm/idt77105.c
drivers/atm/nicstar.c
drivers/atm/nicstar.h
drivers/block/lvm.c
drivers/block/md.c
drivers/block/raid0.c
drivers/block/raid1.c
drivers/block/raid5.c
drivers/ide/piix.c
drivers/net/3c509.c
drivers/net/3c515.c
drivers/scsi/NCR5380.c
drivers/scsi/atp870u.c
drivers/scsi/seagate.c
drivers/sound/os.h
fs/binfmt_aout.c
fs/dcache.c
fs/file.c
fs/inode.c
fs/namei.c
fs/open.c
fs/proc/proc_misc.c
include/linux/dcache.h
include/linux/fs.h
include/linux/slab.h
include/linux/spinlock.h
include/linux/sunrpc/sched.h
include/linux/sunrpc/xprt.h
init/main.c
kernel/fork.c
kernel/ksyms.c
kernel/sys.c
lib/Makefile
lib/dec_and_lock.c [new file with mode: 0644]
mm/slab.c
net/atm/Makefile
net/atm/clip.c
net/atm/common.c
net/atm/common.h
net/atm/ipcommon.c
net/atm/ipcommon.h
net/atm/lec.c
net/atm/mpc.c
net/atm/proc.c
net/atm/signaling.c
net/atm/signaling.h
net/atm/svc.c
net/ipv4/ip_gre.c
net/ipv4/ipip.c
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_ftp.c
net/ipv4/netfilter/ip_fw_compat.c
net/ipv4/netfilter/ip_nat_core.c
net/ipv4/netfilter/ip_nat_ftp.c
net/ipv4/netfilter/ip_nat_standalone.c
net/ipv4/netfilter/ip_queue.c
net/ipv4/netfilter/ipt_MASQUERADE.c
net/ipv4/netfilter/ipt_MIRROR.c
net/ipv4/netfilter/ipt_mac.c
net/ipv6/sit.c
net/sunrpc/clnt.c
net/sunrpc/sched.c
net/sunrpc/svcsock.c
net/sunrpc/xprt.c