From: Steve Lord <lord@sgi.com>
Message-Id: <200305231541.h4NFf2p00341@jen.americas.sgi.com>
Date: Fri, 23 May 2003 10:41:02 -0500
Subject: TAKE - merge up to 2.4.21-rc3
To: linux-xfs@oss.sgi.com
Sender: linux-xfs-bounce@oss.sgi.com
Errors-to: linux-xfs-bounce@oss.sgi.com
Precedence: bulk
Content-Length: 2874
Lines: 80

Date:  Fri May 23 08:39:40 PDT 2003
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge.2.4

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs


Modid:  2.4.x-xfs:slinx:149903a
linux/net/core/rtnetlink.c - 1.13
linux/net/802/Makefile - 1.7
linux/mm/mmap.c - 1.50
linux/mm/filemap.c - 1.118
linux/include/linux/tty.h - 1.19
linux/include/linux/sched.h - 1.55
linux/include/asm-m68k/system.h - 1.11
linux/include/asm-i386/uaccess.h - 1.14
linux/include/asm-i386/system.h - 1.26
linux/include/asm-arm/system.h - 1.17
linux/fs/buffer.c - 1.119
linux/drivers/pci/quirks.c - 1.33
linux/drivers/net/Config.in - 1.62
linux/drivers/char/tty_io.c - 1.42
linux/arch/ppc/8xx_io/enet.c - 1.18
linux/arch/i386/kernel/ioport.c - 1.4
linux/Makefile - 1.187
linux/Documentation/Configure.help - 1.145
linux/include/linux/ide.h - 1.35
linux/drivers/isdn/hisax/hfc_pci.c - 1.23
linux/net/802/fc.c - 1.5
linux/drivers/scsi/ips.c - 1.28
linux/include/asm-sh/system.h - 1.13
linux/drivers/net/wan/cosa.c - 1.25
linux/include/linux/pci_ids.h - 1.64
linux/drivers/pci/pci.ids - 1.46
linux/drivers/ide/ide.c - 1.40
linux/drivers/ide/ide-disk.c - 1.23
linux/drivers/ide/Makefile - 1.17
linux/drivers/ide/Config.in - 1.20
linux/include/asm-ppc/mc146818rtc.h - 1.5
linux/include/asm-parisc/linux_logo.h - 1.3
linux/drivers/net/lasi_82596.c - 1.10
linux/include/asm-parisc/ide.h - 1.5
linux/include/asm-parisc/pgalloc.h - 1.6
linux/include/asm-parisc/checksum.h - 1.3
linux/include/asm-parisc/delay.h - 1.3
linux/include/asm-parisc/io.h - 1.3
linux/include/asm-parisc/system.h - 1.4
linux/fs/reiserfs/super.c - 1.17
linux/fs/reiserfs/tail_conversion.c - 1.13
linux/fs/reiserfs/journal.c - 1.19
linux/fs/reiserfs/inode.c - 1.25
linux/include/linux/reiserfs_fs.h - 1.18
linux/include/linux/reiserfs_fs_i.h - 1.8
linux/include/asm-cris/system.h - 1.7
linux/arch/ppc/boot/prep/Makefile - 1.9
linux/drivers/message/fusion/mptscsih.h - 1.5
linux/drivers/message/fusion/mptscsih.c - 1.8
linux/drivers/message/fusion/mptlan.h - 1.5
linux/drivers/message/fusion/mptctl.c - 1.9
linux/drivers/message/fusion/mptbase.h - 1.8
linux/drivers/message/fusion/mptbase.c - 1.8
linux/drivers/message/fusion/isense.c - 1.6
linux/drivers/message/fusion/linux_compat.h - 1.6
linux/fs/intermezzo/vfs.c - 1.9
linux/fs/jbd/commit.c - 1.5
linux/drivers/message/fusion/mptctl.h - 1.4
linux/arch/ppc64/boot/Makefile - 1.3
linux/include/asm-parisc/system_irqsave.h - 1.2
linux/include/asm-parisc/spinlock_t.h - 1.2
linux/drivers/sound/kahlua.c - 1.2
linux/drivers/ide/pci/sl82c105.c - 1.2
linux/drivers/ide/pci/siimage.c - 1.2
linux/drivers/ide/pci/piix.h - 1.2
linux/drivers/ide/pci/piix.c - 1.2
linux/drivers/ide/pci/hpt366.c - 1.2
linux/drivers/ide/pci/amd74xx.h - 1.2
linux/drivers/ide/pci/alim15x3.c - 1.2
linux/drivers/ide/legacy/pdc4030.c - 1.2
linux/drivers/char/ipmi/ipmi_devintf.c - 1.2