Received: (from majordomo@localhost) by oss.sgi.com (8.11.2/8.11.3) id f5TMNdk30883 for linux-xfs-outgoing; Fri, 29 Jun 2001 15:23:39 -0700 Received: from sgi.com (sgi.SGI.COM [192.48.153.1]) by oss.sgi.com (8.11.2/8.11.3) with SMTP id f5TMNdV30876 for ; Fri, 29 Jun 2001 15:23:39 -0700 Received: from zeus-fddi.americas.sgi.com (zeus-fddi.americas.sgi.com [128.162.8.103]) by sgi.com (980327.SGI.8.8.8-aspam/980304.SGI-aspam: SGI does not authorize the use of its proprietary systems or networks for unsolicited or bulk email from the Internet.) via ESMTP id PAA09754 for ; Fri, 29 Jun 2001 15:23:38 -0700 (PDT) mail_from (lord@sgi.com) Received: from daisy-e185.americas.sgi.com (daisy.americas.sgi.com [128.162.185.214]) by zeus-fddi.americas.sgi.com (8.9.3/americas-smart-nospam1.1) with ESMTP id RAA2299212 for ; Fri, 29 Jun 2001 17:22:22 -0500 (CDT) Received: from jen.americas.sgi.com (IDENT:root@jen.americas.sgi.com [128.162.187.49]) by daisy-e185.americas.sgi.com (SGI-8.9.3/SGI-server-1.7) with ESMTP id RAA18816 for ; Fri, 29 Jun 2001 17:22:22 -0500 (CDT) From: Steve Lord Received: by jen.americas.sgi.com (8.11.2/SGI-client-1.7) id f5TMNvb26481; Fri, 29 Jun 2001 17:23:57 -0500 Message-Id: <200106292223.f5TMNvb26481@jen.americas.sgi.com> Date: Fri, 29 Jun 2001 17:23:57 -0500 Subject: TAKE - merge up to 2.4.6-pre7 Sender: owner-linux-xfs@oss.sgi.com Precedence: bulk Just a small one Date: Fri Jun 29 15:21:45 PDT 2001 Workarea: jen.americas.sgi.com:/src/lord/xfs-base The following file(s) were checked into: bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs Modid: 2.4.x-xfs:slinx:97996a linux/Documentation/power/pci.txt - 1.1 linux/mm/vmscan.c - 1.60 linux/include/linux/swap.h - 1.29 linux/include/linux/pci.h - 1.44 linux/drivers/pci/pci.c - 1.38 linux/drivers/net/acenic.h - 1.14 linux/drivers/net/acenic.c - 1.27 linux/Makefile - 1.93 linux/Documentation/pci.txt - 1.13 linux/Documentation/kernel-docs.txt - 1.8 linux/CREDITS - 1.56 linux/include/linux/pm.h - 1.7 linux/drivers/atm/iphase.c - 1.10 linux/net/wanrouter/af_wanpipe.c - 1.2 linux/fs/freevxfs/vxfs_inode.c - 1.3 linux/drivers/mtd/nand/nand_ecc.c - 1.2 linux/drivers/mtd/nand/Makefile - 1.2