Received: (from majordomo@localhost)
	by oss.sgi.com (8.11.2/8.11.3) id f963EGb29688
	for linux-xfs-outgoing; Fri, 5 Oct 2001 20:14:16 -0700
Received: from zok.sgi.com (zok.sgi.com [204.94.215.101])
	by oss.sgi.com (8.11.2/8.11.3) with SMTP id f963E2D29668
	for <linux-xfs@oss.sgi.com>; Fri, 5 Oct 2001 20:14:02 -0700
Received: from zeus-fddi.americas.sgi.com (zeus-fddi.americas.sgi.com [128.162.8.103])
	by zok.sgi.com (8.11.4/8.11.4/linux-outbound_gateway-1.0) with ESMTP id f963DvK03033
	for <linux-xfs@oss.sgi.com>; Fri, 5 Oct 2001 20:13:57 -0700
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 WAA3141128 for <linux-xfs@oss.sgi.com>; Fri, 5 Oct 2001 22:12:41 -0500 (CDT)
Received: from jen.americas.sgi.com (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 WAA74362 for <linux-xfs@oss.sgi.com>; Fri, 5 Oct 2001 22:12:41 -0500 (CDT)
From: Steve Lord <lord@sgi.com>
Received: by jen.americas.sgi.com (8.11.6/SGI-client-1.7) id f963C7o08625; Fri, 5 Oct 2001 22:12:07 -0500
Message-Id: <200110060312.f963C7o08625@jen.americas.sgi.com>
Date: Fri, 5 Oct 2001 22:12:07 -0500
Subject: TAKE - merge up to 2.4.11-pre4
Sender: owner-linux-xfs@oss.sgi.com
Precedence: bulk

Date:  Fri Oct  5 20:12:00 PDT 2001
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge

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


Modid:  2.4.x-xfs:slinx:104073a
linux/drivers/mtd/maps/l440gx.c - 1.1
linux/drivers/mtd/devices/blkmtd.c - 1.1
linux/drivers/mtd/maps/integrator-flash.c - 1.1
linux/drivers/mtd/chips/map_absent.c - 1.1
linux/drivers/mtd/chips/jedec_probe.c - 1.1
linux/drivers/mtd/devices/lart.c - 1.1
linux/drivers/mtd/maps/cdb89712.c - 1.1
linux/include/asm-i386/smpboot.h - 1.1
linux/drivers/mtd/chips/gen_probe.c - 1.1
linux/fs/jffs/jffs_proc.c - 1.1
linux/drivers/mtd/maps/tqm8xxl.c - 1.1
linux/fs/namespace.c - 1.1
linux/fs/jffs/jffs_proc.h - 1.1
linux/drivers/mtd/afs.c - 1.1
linux/include/linux/mtd/gen_probe.h - 1.1
linux/drivers/mtd/maps/solutionengine.c - 1.1
linux/net/irda/irlmp.c - 1.14
linux/net/irda/irlap_event.c - 1.16
linux/net/irda/irias_object.c - 1.11
linux/net/irda/af_irda.c - 1.28
linux/mm/vmscan.c - 1.78
linux/mm/swapfile.c - 1.40
linux/mm/swap_state.c - 1.32
linux/mm/page_alloc.c - 1.57
linux/mm/filemap.c - 1.90
linux/kernel/sched.c - 1.41
linux/kernel/exec_domain.c - 1.14
linux/init/main.c - 1.61
linux/include/net/irda/irlmp.h - 1.8
linux/include/linux/swap.h - 1.43
linux/include/linux/pagemap.h - 1.31
linux/include/asm-i386/smp.h - 1.11
linux/include/asm-i386/io.h - 1.18
linux/include/asm-alpha/system.h - 1.17
linux/include/asm-alpha/pgtable.h - 1.29
linux/include/asm-alpha/core_apecs.h - 1.8
linux/include/asm-alpha/cache.h - 1.8
linux/fs/super.c - 1.60
linux/fs/Makefile - 1.35
linux/fs/Config.in - 1.66
linux/arch/i386/kernel/trampoline.S - 1.4
linux/arch/i386/kernel/smp.c - 1.35
linux/arch/i386/kernel/setup.c - 1.55
linux/arch/i386/kernel/process.c - 1.36
linux/arch/i386/kernel/io_apic.c - 1.30
linux/arch/i386/defconfig - 1.73
linux/arch/i386/config.in - 1.64
linux/arch/i386/boot/compressed/misc.c - 1.12
linux/arch/alpha/kernel/time.c - 1.18
linux/arch/alpha/kernel/sys_cabriolet.c - 1.12
linux/arch/alpha/kernel/setup.c - 1.22
linux/arch/alpha/config.in - 1.34
linux/arch/alpha/boot/bootp.c - 1.6
linux/arch/alpha/boot/Makefile - 1.7
linux/Makefile - 1.129
linux/Documentation/Configure.help - 1.104
linux/drivers/net/irda/smc-ircc.c - 1.22
linux/include/asm-i386/apic.h - 1.14
linux/arch/i386/kernel/smpboot.c - 1.23
linux/arch/i386/kernel/apic.c - 1.20
linux/arch/i386/kernel/mpparse.c - 1.13
linux/include/asm-i386/mpspec.h - 1.6
linux/drivers/pci/setup-res.c - 1.8
linux/drivers/pci/setup-bus.c - 1.4
linux/drivers/net/irda/nsc-ircc.c - 1.17
linux/arch/alpha/kernel/irq_alpha.c - 1.8
linux/Documentation/arm/SA1100/Assabet - 1.3
linux/fs/jffs/Makefile - 1.4
linux/fs/jffs/inode-v23.c - 1.13
linux/fs/jffs/intrep.c - 1.9
linux/fs/jffs/intrep.h - 1.4
linux/fs/jffs/jffs_fm.c - 1.6
linux/fs/jffs/jffs_fm.h - 1.3
linux/include/asm-alpha/mc146818rtc.h - 1.2
linux/drivers/mtd/Config.in - 1.6
linux/drivers/mtd/Makefile - 1.7
linux/drivers/mtd/ftl.c - 1.8
linux/drivers/mtd/mtdblock.c - 1.7
linux/drivers/mtd/mtdchar.c - 1.7
linux/drivers/mtd/mtdcore.c - 1.5
linux/include/linux/jffs.h - 1.4
linux/include/linux/mtd/cfi.h - 1.7
linux/include/linux/mtd/doc2000.h - 1.5
linux/include/linux/mtd/ftl.h - 1.3
linux/include/linux/mtd/iflash.h - 1.2
linux/include/linux/mtd/map.h - 1.7
linux/include/linux/mtd/pmc551.h - 1.3
linux/mm/oom_kill.c - 1.7
linux/net/irda/irnet/irnet_ppp.c - 1.7
linux/net/irda/irnet/irnet_irda.c - 1.6
linux/drivers/mtd/nftlmount.c - 1.5
linux/drivers/mtd/mtdpart.c - 1.4
linux/mm/shmem.c - 1.16
linux/drivers/net/irda/irda-usb.c - 1.8
linux/include/net/irda/irda-usb.h - 1.3
linux/drivers/mtd/nand/nand.c - 1.2
linux/drivers/mtd/nftlcore.c - 1.5
linux/drivers/mtd/bootldr.c - 1.2
linux/drivers/mtd/nand/spia.c - 1.4
linux/drivers/mtd/redboot.c - 1.2
linux/drivers/mtd/nand/Makefile - 1.3
linux/drivers/mtd/nand/Config.in - 1.5
linux/drivers/mtd/mtdblock_ro.c - 1.3
linux/drivers/mtd/maps/vmax301.c - 1.2
linux/drivers/mtd/maps/sun_uflash.c - 1.2
linux/drivers/mtd/maps/sc520cdp.c - 1.2
linux/drivers/mtd/maps/sbc_gxx.c - 1.2
linux/drivers/mtd/maps/sa1100-flash.c - 1.2
linux/drivers/mtd/maps/rpxlite.c - 1.2
linux/drivers/mtd/maps/pnc2000.c - 1.2
linux/drivers/mtd/maps/physmap.c - 1.2
linux/drivers/mtd/maps/octagon-5066.c - 1.2
linux/drivers/mtd/maps/ocelot.c - 1.2
linux/include/linux/mtd/cfi_endian.h - 1.2
linux/drivers/mtd/maps/nora.c - 1.2
linux/drivers/mtd/maps/netsc520.c - 1.2
linux/drivers/mtd/maps/iq80310.c - 1.2
linux/drivers/mtd/maps/elan-104nc.c - 1.2
linux/drivers/mtd/maps/dc21285.c - 1.2
linux/drivers/mtd/maps/dbox2-flash.c - 1.2
linux/drivers/mtd/maps/cstm_mips_ixx.c - 1.2
linux/drivers/mtd/maps/cfi_flagadm.c - 1.2
linux/drivers/mtd/maps/Makefile - 1.2
linux/drivers/mtd/maps/Config.in - 1.3
linux/drivers/mtd/devices/slram.c - 1.2
linux/drivers/mtd/devices/pmc551.c - 1.2
linux/drivers/mtd/devices/mtdram.c - 1.2
linux/drivers/mtd/devices/docprobe.c - 1.3
linux/drivers/mtd/devices/docecc.c - 1.4
linux/drivers/mtd/devices/doc2001.c - 1.2
linux/drivers/mtd/devices/doc2000.c - 1.2
linux/drivers/mtd/devices/doc1000.c - 1.2
linux/drivers/mtd/devices/Makefile - 1.2
linux/drivers/mtd/devices/Config.in - 1.2
linux/drivers/mtd/chips/sharp.c - 1.2
linux/drivers/mtd/chips/map_rom.c - 1.2
linux/drivers/mtd/chips/map_ram.c - 1.2
linux/drivers/mtd/chips/jedec.c - 1.2
linux/drivers/mtd/chips/chipreg.c - 1.2
linux/drivers/mtd/chips/cfi_probe.c - 1.2
linux/drivers/mtd/chips/cfi_jedec.c - 1.2
linux/drivers/mtd/chips/cfi_cmdset_0002.c - 1.2
linux/drivers/mtd/chips/cfi_cmdset_0001.c - 1.2
linux/drivers/mtd/chips/amd_flash.c - 1.3
linux/drivers/mtd/chips/Makefile - 1.2
linux/drivers/mtd/chips/Config.in - 1.2
linux/drivers/net/irda/vlsi_ir.c - 1.5
linux/include/net/irda/vlsi_ir.h - 1.2
linux/fs/jffs2/Makefile - 1.2
linux/fs/jffs2/background.c - 1.2
linux/fs/jffs2/compr.c - 1.2
linux/fs/jffs2/compr_rubin.c - 1.2
linux/fs/jffs2/compr_zlib.c - 1.2
linux/fs/jffs2/erase.c - 1.2
linux/fs/jffs2/file.c - 1.2
linux/fs/jffs2/gc.c - 1.2
linux/fs/jffs2/nodelist.c - 1.2
linux/fs/jffs2/nodelist.h - 1.2
linux/fs/jffs2/nodemgmt.c - 1.2
linux/fs/jffs2/pushpull.c - 1.2
linux/fs/jffs2/pushpull.h - 1.2
linux/fs/jffs2/scan.c - 1.2
linux/fs/jffs2/super.c - 1.2
linux/fs/jffs2/write.c - 1.2
linux/include/linux/jffs2_fs_sb.h - 1.2