Received: (from majordomo@localhost)
	by oss.sgi.com (8.11.2/8.11.3) id fAK183016085
	for linux-xfs-outgoing; Mon, 19 Nov 2001 17:08:03 -0800
Received: from sgi.com (sgi.SGI.COM [192.48.153.1])
	by oss.sgi.com (8.11.2/8.11.3) with SMTP id fAK17wW16060
	for <linux-xfs@oss.sgi.com>; Mon, 19 Nov 2001 17:07:58 -0800
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 QAA08509
	for <linux-xfs@oss.sgi.com>; Mon, 19 Nov 2001 16:07:44 -0800 (PST)
	mail_from (eric@sgi.com)
Received: from daisy-e185.americas.sgi.com (daisy-e194.americas.sgi.com [128.162.194.214]) by zeus-fddi.americas.sgi.com (8.9.3/americas-smart-nospam1.1) with ESMTP id SAA3387307 for <linux-xfs@oss.sgi.com>; Mon, 19 Nov 2001 18:06:20 -0600 (CST)
Received: from stout.americas.sgi.com (stout.americas.sgi.com [128.162.187.5]) by daisy-e185.americas.sgi.com (SGI-8.9.3/SGI-server-1.7) with ESMTP id SAA77725 for <linux-xfs@oss.sgi.com>; Mon, 19 Nov 2001 18:06:20 -0600 (CST)
Received: by stout.americas.sgi.com (8.11.6/SGI-client-1.7) id fAK03k115100; Mon, 19 Nov 2001 18:03:46 -0600
Message-Id: <200111200003.fAK03k115100@stout.americas.sgi.com>
Date: Mon, 19 Nov 2001 18:03:46 -0600
From: Eric Sandeen <sandeen@sgi.com>
Subject: TAKE - Merge up to 2.4.15-pre6
Sender: owner-linux-xfs@oss.sgi.com
Precedence: bulk

Merge up to 2.4.15-pre6

Date:  Mon Nov 19 16:04:46 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:107058a
linux/arch/ppc/lib/dec_and_lock.c - 1.1
linux/include/linux/wait.h - 1.12
linux/include/asm-ppc/machdep.h - 1.20
linux/fs/proc/inode.c - 1.16
linux/fs/inode.c - 1.56
linux/drivers/pci/proc.c - 1.22
linux/drivers/char/vt.c - 1.23
linux/drivers/cdrom/cdrom.c - 1.36
linux/arch/ppc/lib/Makefile - 1.8
linux/arch/ppc/kernel/setup.c - 1.37
linux/arch/ppc/kernel/prep_setup.c - 1.27
linux/arch/ppc/kernel/ppc_ksyms.c - 1.38
linux/arch/ppc/kernel/pmac_setup.c - 1.27
linux/arch/ppc/kernel/pci.c - 1.23
linux/arch/ppc/kernel/chrp_setup.c - 1.27
linux/arch/ppc/kernel/apus_setup.c - 1.20
linux/arch/ppc/config.in - 1.41
linux/arch/arm/kernel/setup.c - 1.23
linux/arch/alpha/kernel/time.c - 1.20
linux/arch/alpha/kernel/setup.c - 1.25
linux/Makefile - 1.156
linux/MAINTAINERS - 1.84
linux/arch/ppc/kernel/gemini_setup.c - 1.20
linux/arch/sh/kernel/setup.c - 1.17
linux/arch/ppc/kernel/m8xx_setup.c - 1.20
linux/fs/proc/proc_misc.c - 1.26
linux/arch/ppc/kernel/oak_setup.c - 1.9
linux/drivers/char/agp/agpgart_be.c - 1.28
linux/arch/ppc/kernel/walnut_setup.c - 1.6
linux/arch/ppc/kernel/m8260_setup.c - 1.13
linux/arch/s390/kernel/setup.c - 1.6
linux/scripts/Lindent - 1.3
linux/arch/s390x/kernel/setup.c - 1.5
linux/fs/seq_file.c - 1.3