(Once more, with feeling!)
Merge up to 2.4.15-pre4
Date: Mon Nov 12 15:32:07 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:106589a
linux/arch/i386/kernel/acpitable.h - 1.1
linux/drivers/net/pcmcia/ax8390.h - 1.1
linux/drivers/net/pcmcia/axnet_cs.c - 1.1
linux/kernel/sched.c - 1.45
linux/include/linux/pci.h - 1.52
linux/include/linux/kernel.h - 1.29
linux/include/linux/console.h - 1.8
linux/include/asm-i386/processor.h - 1.30
linux/fs/ext2/super.c - 1.20
linux/fs/Makefile - 1.42
linux/fs/Config.in - 1.71
linux/drivers/usb/hub.h - 1.17
linux/drivers/usb/hub.c - 1.40
linux/drivers/pci/pci.c - 1.47
linux/drivers/net/eepro100.c - 1.35
linux/drivers/isdn/isdnloop/isdnloop.c - 1.11
linux/drivers/char/Config.in - 1.54
linux/arch/i386/math-emu/fpu_proto.h - 1.3
linux/arch/i386/kernel/setup.c - 1.60
linux/arch/i386/defconfig - 1.82
linux/arch/i386/boot/compressed/misc.c - 1.13
linux/Makefile - 1.154
linux/Documentation/Configure.help - 1.117
linux/drivers/parport/parport_pc.c - 1.43
linux/include/linux/isapnp.h - 1.11
linux/drivers/pnp/isapnp.c - 1.23
linux/drivers/pcmcia/smc34c90.h - 1.4
linux/drivers/pcmcia/rsrc_mgr.h - 1.6
linux/drivers/pcmcia/rsrc_mgr.c - 1.14
linux/drivers/pcmcia/i82365.c - 1.22
linux/drivers/pcmcia/ds.c - 1.17
linux/drivers/pcmcia/cs.c - 1.30
linux/drivers/pcmcia/cistpl.c - 1.12
linux/drivers/pcmcia/cb_enabler.c - 1.10
linux/drivers/pcmcia/cardbus.c - 1.18
linux/drivers/pcmcia/Makefile - 1.12
linux/drivers/net/pcmcia/Makefile - 1.19
linux/drivers/net/pcmcia/Config.in - 1.25
linux/fs/proc/proc_misc.c - 1.25
linux/drivers/pcmcia/old-yenta.h - 1.3
linux/Documentation/usb/usb-serial.txt - 1.17
linux/drivers/sound/ac97_codec.c - 1.21
linux/include/linux/raid/md_k.h - 1.14
linux/include/linux/ac97_codec.h - 1.12
linux/drivers/video/hgafb.c - 1.12
linux/drivers/parport/ChangeLog - 1.24
linux/drivers/usb/serial/ftdi_sio.c - 1.24
linux/drivers/usb/serial/visor.h - 1.7
linux/drivers/usb/serial/visor.c - 1.25
linux/arch/i386/kernel/bluesmoke.c - 1.14
linux/drivers/md/lvm-snap.c - 1.10
linux/drivers/usb/serial/mct_u232.c - 1.11
linux/drivers/sound/ymfpci.c - 1.13
linux/drivers/usb/usb-skeleton.c - 1.5
linux/fs/partitions/ldm.h - 1.5
linux/fs/partitions/ldm.c - 1.4
linux/include/linux/raid/multipath.h - 1.2
linux/drivers/md/multipath.c - 1.3
linux/drivers/usb/serial/ir-usb.c - 1.4
linux/arch/i386/kernel/acpitable.c - 1.2
linux/fs/intermezzo/journal_xfs.c - 1.2
linux/fs/intermezzo/methods.c - 1.2
linux/fs/seq_file.c - 1.2
|