Merge up to 2.4.15-pre7
Date: Tue Nov 20 10:59:02 PST 2001
Workarea: stout.americas.sgi.com:/localhome/eric/merge/workarea
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: 2.4.x-xfs:slinx:107099a
linux/mm/page_io.c - 1.19
linux/mm/page_alloc.c - 1.70
linux/include/linux/ufs_fs_sb.h - 1.4
linux/include/linux/ufs_fs_i.h - 1.4
linux/include/linux/ufs_fs.h - 1.12
linux/include/linux/fs.h - 1.134
linux/fs/ufs/util.h - 1.7
linux/fs/ufs/truncate.c - 1.11
linux/fs/ufs/swab.h - 1.3
linux/fs/ufs/super.c - 1.19
linux/fs/ufs/inode.c - 1.16
linux/fs/ufs/ialloc.c - 1.11
linux/fs/ufs/dir.c - 1.13
linux/fs/ufs/cylinder.c - 1.4
linux/fs/ufs/balloc.c - 1.10
linux/fs/inode.c - 1.57
linux/drivers/video/clgenfb.c - 1.23
linux/drivers/net/eepro.c - 1.23
linux/drivers/net/acenic.h - 1.17
linux/drivers/net/acenic.c - 1.35
linux/drivers/net/Config.in - 1.52
linux/drivers/block/loop.c - 1.43
linux/arch/i386/kernel/setup.c - 1.62
linux/arch/alpha/defconfig - 1.20
linux/arch/alpha/config.in - 1.37
linux/Makefile - 1.157
linux/Documentation/fb/clgenfb.txt - 1.5
linux/include/asm-sh/string.h - 1.8
linux/drivers/net/tulip/tulip_core.c - 1.34
linux/drivers/net/natsemi.c - 1.17
linux/drivers/md/lvm.c - 1.24
linux/drivers/net/tulip/ChangeLog - 1.10
linux/include/linux/ethtool.h - 1.8
linux/drivers/sound/ymfpci.c - 1.14
linux/drivers/net/fealnx.c - 1.8
linux/drivers/net/dl2k.h - 1.4
linux/Documentation/networking/dl2k.txt - 1.4
linux/drivers/net/dl2k.c - 1.6
linux/drivers/net/8139cp.c - 1.3
|