Merge with 2.4.0-test3-pre7.
commit35385d7a83b4cae6d5ea5f80f3b3377d94178344
authorRalf Baechle <ralf@linux-mips.org>
Sun, 9 Jul 2000 23:29:35 +0000 (9 23:29 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 9 Jul 2000 23:29:35 +0000 (9 23:29 +0000)
tree49494d95dfef31ba4f9a697d31e4028cf65a57bd
parentd9d8062e7b49943b2a2fb034f817a9fc217fd40f
Merge with 2.4.0-test3-pre7.
73 files changed:
CREDITS
Documentation/DocBook/parportbook.tmpl
Documentation/fb/framebuffer.txt
Documentation/filesystems/Locking [new file with mode: 0644]
Makefile
arch/arm/kernel/sys_arm.c
arch/ia64/ia32/sys_ia32.c
arch/ia64/kernel/sys_ia64.c
arch/mips/kernel/sysmips.c
arch/ppc/amiga/chipram.c
arch/ppc/kernel/syscalls.c
arch/sparc/kernel/sys_sparc.c
arch/sparc/kernel/sys_sunos.c
arch/sparc64/kernel/sys_sparc.c
arch/sparc64/kernel/sys_sparc32.c
arch/sparc64/kernel/sys_sunos32.c
drivers/i2c/i2c-core.c
drivers/isdn/divert/divert_procfs.c
drivers/isdn/hysdn/hysdn_procconf.c
drivers/isdn/hysdn/hysdn_procfs.c
drivers/isdn/hysdn/hysdn_proclog.c
drivers/mtd/nftl.c
drivers/net/ne.c
drivers/parport/daisy.c
drivers/parport/ieee1284.c
drivers/parport/share.c
drivers/pnp/isapnp_proc.c
drivers/scsi/sd.c
drivers/usb/usb-uhci-debug.h
fs/adfs/inode.c
fs/affs/inode.c
fs/bfs/inode.c
fs/block_dev.c
fs/coda/dir.c
fs/dcache.c
fs/devfs/base.c
fs/devices.c
fs/ext2/inode.c
fs/fat/fatfs_syms.c
fs/fat/inode.c
fs/fifo.c
fs/filesystems.c
fs/hfs/inode.c
fs/hpfs/file.c
fs/hpfs/inode.c
fs/jffs/inode-v23.c
fs/ncpfs/dir.c
fs/nfs/inode.c
fs/nfsd/nfsfh.c
fs/ntfs/fs.c
fs/open.c
fs/pipe.c
fs/proc/proc_misc.c
fs/qnx4/inode.c
fs/smbfs/dir.c
fs/smbfs/file.c
fs/smbfs/inode.c
fs/sysv/inode.c
fs/udf/super.c
fs/ufs/ialloc.c
fs/ufs/inode.c
fs/ufs/super.c
include/linux/dcache.h
include/linux/parport.h
ipc/shm.c
kernel/acct.c
kernel/ksyms.c
mm/filemap.c
mm/slab.c
net/atm/mpoa_proc.c
net/atm/proc.c
net/netsyms.c
net/socket.c