TAKE - merge up to 2.5.7

[Steve Lord <lord@sgi.com>]

Date:  Mon Mar 18 20:06:41 PST 2002
Workarea:  jen.americas.sgi.com:/src/lord/xfs-linux.2.5

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


Modid:  2.5.x-xfs:slinx:114400a
linux/Documentation/sound/alsa/serial-u16550.txt - 1.1
linux/sound/core/ioctl32/seq32.c - 1.1
linux/ipc/shm.c - 1.53
linux/include/linux/msdos_fs_sb.h - 1.9
linux/include/linux/msdos_fs.h - 1.18
linux/include/linux/iso_fs.h - 1.15
linux/include/linux/init.h - 1.17
linux/include/linux/hfs_fs.h - 1.11
linux/include/linux/fs.h - 1.162
linux/include/linux/amigaffs.h - 1.9
linux/include/linux/affs_fs_sb.h - 1.4
linux/include/linux/affs_fs.h - 1.10
linux/include/asm-ppc/siginfo.h - 1.9
linux/fs/vfat/namei.c - 1.29
linux/fs/umsdos/inode.c - 1.24
linux/fs/super.c - 1.82
linux/fs/msdos/namei.c - 1.29
linux/fs/msdos/msdosfs_syms.c - 1.10
linux/fs/isofs/rock.c - 1.20
linux/fs/isofs/namei.c - 1.11
linux/fs/isofs/joliet.c - 1.8
linux/fs/isofs/inode.c - 1.35
linux/fs/isofs/dir.c - 1.15
linux/fs/hfs/super.c - 1.16
linux/fs/filesystems.c - 1.22
linux/fs/affs/symlink.c - 1.13
linux/fs/affs/super.c - 1.22
linux/fs/affs/namei.c - 1.18
linux/fs/affs/inode.c - 1.19
linux/fs/affs/file.c - 1.26
linux/fs/affs/dir.c - 1.13
linux/fs/affs/bitmap.c - 1.9
linux/fs/affs/amigaffs.c - 1.12
linux/drivers/pci/pci.c - 1.57
linux/drivers/Makefile - 1.31
linux/arch/sparc64/defconfig - 1.64
linux/arch/sparc64/config.in - 1.54
linux/arch/sparc/config.in - 1.35
linux/arch/ppc/kernel/align.c - 1.9
linux/arch/ppc/defconfig - 1.39
linux/arch/ppc/config.in - 1.47
linux/arch/mips/config.in - 1.28
linux/arch/m68k/config.in - 1.27
linux/arch/i386/defconfig - 1.104
linux/arch/i386/config.in - 1.76
linux/arch/arm/config.in - 1.37
linux/arch/alpha/defconfig - 1.26
linux/arch/alpha/config.in - 1.43
linux/Makefile - 1.192
linux/include/linux/ide.h - 1.44
linux/drivers/usb/printer.c - 1.44
linux/arch/arm/def-configs/footbridge - 1.11
linux/drivers/pnp/isapnp.c - 1.27
linux/arch/sh/config.in - 1.24
linux/fs/udf/super.c - 1.28
linux/fs/udf/udf_sb.h - 1.8
linux/fs/udf/udfdecl.h - 1.19
linux/include/linux/pci_ids.h - 1.62
linux/drivers/pci/pci.ids - 1.44
linux/arch/ppc/configs/pmac_defconfig - 1.6
linux/arch/ppc/configs/common_defconfig - 1.26
linux/fs/cramfs/uncompress.c - 1.6
linux/drivers/usb/hid.h - 1.18
linux/arch/ia64/defconfig - 1.14
linux/arch/ia64/config.in - 1.26
linux/arch/mips64/config.in - 1.19
linux/drivers/ide/piix.c - 1.19
linux/drivers/ide/pdc4030.c - 1.12
linux/drivers/ide/ide-proc.c - 1.15
linux/drivers/ide/ide-pci.c - 1.24
linux/drivers/ide/ide-disk.c - 1.30
linux/drivers/ide/Makefile - 1.18
linux/drivers/ide/Config.in - 1.20
linux/net/ipv4/netfilter/ip_conntrack_standalone.c - 1.13
linux/drivers/usb/serial/keyspan_pda.c - 1.23
linux/drivers/usb/serial/ftdi_sio.c - 1.33
linux/drivers/usb/serial/usbserial.c - 1.32
linux/drivers/usb/serial/whiteheat.c - 1.23
linux/drivers/usb/serial/visor.c - 1.32
linux/drivers/usb/serial/omninet.c - 1.22
linux/drivers/usb/serial/digi_acceleport.c - 1.24
linux/drivers/usb/serial/keyspan.c - 1.24
linux/drivers/ide/slc90e66.c - 1.9
linux/drivers/usb/serial/mct_u232.c - 1.17
linux/drivers/usb/serial/empeg.c - 1.21
linux/mm/shmem.c - 1.34
linux/arch/cris/config.in - 1.12
linux/drivers/usb/serial/io_edgeport.c - 1.23
linux/net/wanrouter/af_wanpipe.c - 1.6
linux/arch/mips/defconfig-it8172 - 1.4
linux/arch/mips/defconfig-ddb5476 - 1.4
linux/include/linux/if_wanpipe.h - 1.3
linux/drivers/usb/catc.c - 1.10
linux/drivers/usb/serial/cyberjack.c - 1.11
linux/drivers/usb/serial/pl2303.c - 1.12
linux/drivers/ide/amd74xx.c - 1.7
linux/drivers/usb/hid-core.c - 1.11
linux/drivers/usb/hiddev.c - 1.6
linux/include/linux/hiddev.h - 1.2
linux/fs/jffs2/super.c - 1.10
linux/include/linux/jffs2_fs_sb.h - 1.5
linux/drivers/usb/serial/ir-usb.c - 1.12
linux/fs/inflate_fs/Makefile - 1.2
linux/fs/inflate_fs/adler32.c - 1.2
linux/fs/inflate_fs/infblock.c - 1.2
linux/fs/inflate_fs/infblock.h - 1.2
linux/fs/inflate_fs/infcodes.c - 1.2
linux/fs/inflate_fs/infcodes.h - 1.2
linux/fs/inflate_fs/inffast.c - 1.2
linux/fs/inflate_fs/inffast.h - 1.2
linux/fs/inflate_fs/inffixed.h - 1.2
linux/fs/inflate_fs/inflate.c - 1.2
linux/fs/inflate_fs/inflate_syms.c - 1.3
linux/fs/inflate_fs/inftrees.c - 1.2
linux/fs/inflate_fs/inftrees.h - 1.2
linux/fs/inflate_fs/infutil.c - 1.2
linux/fs/inflate_fs/infutil.h - 1.3
linux/fs/inflate_fs/zutil.h - 1.2
linux/fs/isofs/compress.c - 1.6
linux/include/linux/zlib_fs.h - 1.3
linux/drivers/block/block_ioctl.c - 1.7
linux/drivers/usb/serial/ipaq.c - 1.5
linux/drivers/usb/serial/kl5kusb105.c - 1.5
linux/arch/arm/def-configs/iq80310 - 1.3
linux/drivers/ide/ide-taskfile.c - 1.7
linux/arch/alpha/Config.help - 1.4
linux/arch/arm/Config.help - 1.6
linux/arch/cris/Config.help - 1.4
linux/arch/i386/Config.help - 1.6
linux/arch/ia64/Config.help - 1.4
linux/arch/m68k/Config.help - 1.3
linux/arch/mips/Config.help - 1.3
linux/arch/mips64/Config.help - 1.3
linux/arch/parisc/Config.help - 1.2
linux/arch/ppc/Config.help - 1.5
linux/arch/sh/Config.help - 1.3
linux/drivers/usb/Config.help - 1.5
linux/arch/sparc64/Config.help - 1.3
linux/drivers/ide/Config.help - 1.7
linux/drivers/base/core.c - 1.6
linux/sound/ppc/pmac.c - 1.3
linux/sound/pci/ymfpci/ymfpci_main.c - 1.3
linux/sound/pci/ymfpci/ymfpci.c - 1.5
linux/sound/pci/via8233.c - 1.4
linux/sound/pci/via686.c - 1.4
linux/sound/pci/trident/trident_main.c - 1.3
linux/sound/pci/trident/trident.c - 1.4
linux/sound/pci/sonicvibes.c - 1.4
linux/sound/pci/rme9652/rme9652.c - 1.4
linux/sound/pci/rme96.c - 1.4
linux/sound/pci/nm256/nm256.c - 1.4
linux/sound/pci/maestro3.c - 1.4
linux/sound/pci/korg1212/korg1212.c - 1.4
linux/sound/pci/intel8x0.c - 1.4
linux/sound/pci/ice1712.c - 1.4
linux/sound/pci/fm801.c - 1.4
linux/sound/pci/es1968.c - 1.4
linux/sound/pci/es1938.c - 1.4
linux/sound/pci/ens1370.c - 1.4
linux/sound/pci/emu10k1/emuproc.c - 1.4
linux/sound/pci/emu10k1/emupcm.c - 1.4
linux/sound/pci/emu10k1/emu10k1_main.c - 1.4
linux/sound/pci/emu10k1/emu10k1.c - 1.4
linux/sound/pci/emu10k1/Makefile - 1.2
linux/sound/pci/cs46xx/cs46xx_lib.c - 1.3
linux/sound/pci/cs46xx/cs46xx.c - 1.4
linux/sound/pci/cs4281.c - 1.4
linux/sound/pci/cmipci.c - 1.4
linux/sound/pci/als4000.c - 1.4
linux/sound/pci/ali5451/ali5451.c - 1.4
linux/sound/pci/ac97/ac97_codec.c - 1.4
linux/arch/ppc/configs/k2_defconfig - 1.3
linux/arch/ppc/configs/menf1_defconfig - 1.3
linux/arch/ppc/configs/mvme5100_defconfig - 1.2
linux/arch/ppc/configs/pplus_defconfig - 1.3
linux/arch/ppc/configs/sandpoint_defconfig - 1.3
linux/arch/ppc/kernel/prom_init.c - 1.2
linux/arch/ppc/platforms/pmac_feature.c - 1.2
linux/arch/x86_64/config.in - 1.4
linux/sound/oss/Config.help - 1.2
linux/sound/isa/wavefront/wavefront_synth.c - 1.4
linux/sound/isa/wavefront/wavefront_midi.c - 1.3
linux/sound/isa/wavefront/wavefront_fx.c - 1.3
linux/sound/isa/wavefront/wavefront.c - 1.4
linux/sound/isa/wavefront/Makefile - 1.2
linux/sound/isa/sb/sb_common.c - 1.4
linux/sound/isa/sb/sb8.c - 1.5
linux/sound/isa/sb/sb16_main.c - 1.4
linux/sound/isa/sb/sb16.c - 1.4
linux/sound/isa/sb/es968.c - 1.3
linux/sound/isa/sb/emu8000.c - 1.4
linux/sound/isa/opl3sa2.c - 1.5
linux/sound/isa/gus/interwave.c - 1.4
linux/sound/isa/gus/gusmax.c - 1.4
linux/sound/isa/gus/gusextreme.c - 1.4
linux/sound/isa/gus/gusclassic.c - 1.4
linux/sound/isa/es18xx.c - 1.4
linux/sound/isa/es1688/es1688.c - 1.4
linux/sound/isa/dt0197h.c - 1.4
linux/sound/isa/cs423x/cs4236.c - 1.4
linux/sound/isa/cmi8330.c - 1.4
linux/sound/isa/azt2320.c - 1.5
linux/sound/isa/als100.c - 1.4
linux/sound/isa/ad1816a/ad1816a.c - 1.4
linux/sound/drivers/serial-u16550.c - 1.5
linux/sound/core/seq/seq_timer.h - 1.2
linux/sound/core/seq/seq_sync.h - 1.2
linux/sound/core/seq/seq_sync.c - 1.2
linux/sound/core/seq/seq_queue.h - 1.2
linux/sound/core/seq/seq_queue.c - 1.3
linux/sound/core/seq/seq_mtc.c - 1.2
linux/sound/core/seq/seq_midi_clock.c - 1.2
linux/sound/core/seq/seq_dtl.c - 1.2
linux/sound/core/seq/seq_device.c - 1.4
linux/sound/core/seq/oss/seq_oss_synth.c - 1.3
linux/sound/core/seq/oss/seq_oss_midi.c - 1.3
linux/sound/core/seq/oss/seq_oss_init.c - 1.3
linux/sound/core/seq/Makefile - 1.4
linux/sound/core/rtctimer.c - 1.6
linux/sound/core/rawmidi.c - 1.4
linux/sound/core/pcm_native.c - 1.4
linux/sound/core/oss/pcm_oss.c - 1.4
linux/sound/core/misc.c - 1.4
linux/sound/core/Makefile - 1.4
linux/sound/core/Config.in - 1.5
linux/include/sound/version.h - 1.5
linux/include/sound/trident.h - 1.3
linux/include/sound/sndmagic.h - 1.2
linux/include/sound/rawmidi.h - 1.2
linux/include/sound/emu10k1.h - 1.3
linux/include/sound/cs46xx.h - 1.3
linux/include/sound/asoundef.h - 1.2
linux/include/asm-ppc/thread_info.h - 1.3
linux/arch/ppc64/config.in - 1.2
linux/sound/core/ioctl32/timer32.c - 1.2
linux/sound/core/ioctl32/rawmidi32.c - 1.2
linux/sound/core/ioctl32/pcm32.c - 1.2
linux/sound/core/ioctl32/ioctl32.c - 1.2
linux/sound/core/ioctl32/hwdep32.c - 1.2
linux/sound/core/ioctl32/Makefile - 1.2
linux/fs/jffs2/os-linux.h - 1.2
linux/arch/ia64/sn/configs/sn1/defconfig-bigsur-mp - 1.2
linux/arch/ia64/sn/configs/sn1/defconfig-bigsur-sp - 1.2
linux/drivers/acpi/acpi_bus.c - 1.2