v2.5.1.4 -> v2.5.1.5
authorLinus Torvalds <torvalds@athlon.transmeta.com>
Tue, 5 Feb 2002 07:59:43 +0000 (23:59 -0800)
committerLinus Torvalds <torvalds@athlon.transmeta.com>
Tue, 5 Feb 2002 07:59:43 +0000 (23:59 -0800)
commitba6edf537004b1c68a0736c95ebe39a30a2537fb
treeb4a2cd81ca09ab6cd8e442458d6da722422ad952
parentd0415686774477153ca911a612f74c2d2bb11be6
v2.5.1.4 -> v2.5.1.5

- Dave Jones: more merging, fix up last merge..
- release to sync with Dave
70 files changed:
Makefile
arch/i386/kernel/Makefile
arch/i386/kernel/setup-visws.c [new file with mode: 0644]
arch/i386/kernel/setup.c
arch/i386/kernel/smpboot.c
drivers/acpi/ospm/thermal/tzpolicy.c
drivers/block/ps2esdi.c
drivers/char/ftape/RELEASE-NOTES
drivers/char/ftape/compressor/zftape-compress.c
drivers/char/ftape/lowlevel/ftape-ctl.c
drivers/char/ftape/zftape/zftape-ctl.c
drivers/char/ftape/zftape/zftape-read.c
drivers/char/ftape/zftape/zftape-write.c
drivers/ide/ide-cd.c
drivers/ide/ide-disk.c
drivers/ide/ide-floppy.c
drivers/net/hamradio/soundmodem/sm_sbc.c
drivers/net/hamradio/soundmodem/sm_wss.c
drivers/net/wan/sdla_chdlc.c
drivers/net/wan/sdla_fr.c
drivers/net/wan/sdla_ppp.c
drivers/net/wan/sdla_x25.c
drivers/net/wan/sdlamain.c
drivers/s390/s390io.c
drivers/scsi/fdomain.c
drivers/scsi/fdomain.h
drivers/scsi/ncr53c8xx.c
drivers/scsi/scsi_scan.c
drivers/scsi/sym53c8xx_comm.h
drivers/sound/ad1848.c
drivers/sound/msnd.c
drivers/sound/os.h
drivers/sound/sb_card.c
drivers/usb/usbnet.c
drivers/video/fbmem.c
fs/devfs/base.c
fs/ext2/super.c
fs/ext3/Makefile
fs/ext3/acl.c [deleted file]
fs/ext3/inode.c
fs/ext3/super.c
fs/inflate_fs/inflate_syms.c
fs/intermezzo/file.c
fs/intermezzo/journal.c
fs/intermezzo/psdev.c
fs/jbd/commit.c
fs/jbd/journal.c
fs/jbd/recovery.c
fs/jbd/revoke.c
fs/jbd/transaction.c
fs/minix/inode.c
fs/msdos/msdosfs_syms.c
fs/namespace.c
fs/sysv/ChangeLog
fs/sysv/inode.c
fs/sysv/super.c
fs/ufs/inode.c
fs/ufs/super.c
fs/vfat/vfatfs_syms.c
include/asm-i386/cpufeature.h
include/asm-i386/msr.h
include/asm-i386/smp.h
include/linux/ext3_fs.h
include/linux/ext3_jbd.h
include/linux/jbd.h
include/linux/sched.h
kernel/sched.c
net/packet/af_packet.c
net/wanrouter/wanmain.c
net/wanrouter/wanproc.c