Merge up to 2.4.15-pre5
Date: Fri Nov 16 14:21:00 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:106956a
linux/net/irda/irda_device.c - 1.21
linux/net/ipv4/tcp_input.c - 1.32
linux/net/ipv4/ipconfig.c - 1.23
linux/mm/memory.c - 1.71
linux/mm/filemap.c - 1.100
linux/include/linux/swap.h - 1.50
linux/include/linux/module.h - 1.29
linux/include/asm-sparc64/pgtable.h - 1.28
linux/include/asm-sparc64/io.h - 1.15
linux/include/asm-sparc/smp.h - 1.10
linux/include/asm-sparc/pgtable.h - 1.21
linux/include/asm-sparc/io.h - 1.9
linux/fs/buffer.c - 1.95
linux/fs/affs/super.c - 1.13
linux/drivers/video/virgefb.c - 1.14
linux/drivers/video/vfb.c - 1.12
linux/drivers/video/vesafb.c - 1.17
linux/drivers/video/valkyriefb.c - 1.14
linux/drivers/video/tgafb.c - 1.17
linux/drivers/video/sgivwfb.c - 1.12
linux/drivers/video/retz3fb.c - 1.14
linux/drivers/video/platinumfb.c - 1.13
linux/drivers/video/macfb.c - 1.12
linux/drivers/video/imsttfb.c - 1.19
linux/drivers/video/igafb.c - 1.15
linux/drivers/video/fm2fb.c - 1.11
linux/drivers/video/fbmem.c - 1.40
linux/drivers/video/cyberfb.c - 1.14
linux/drivers/video/controlfb.c - 1.18
linux/drivers/video/amifb.c - 1.20
linux/drivers/video/acornfb.c - 1.21
linux/drivers/video/Config.in - 1.30
linux/drivers/sbus/char/su.c - 1.20
linux/drivers/net/bmac.c - 1.17
linux/drivers/net/Config.in - 1.51
linux/drivers/char/rtc.c - 1.24
linux/arch/sparc64/mm/ultra.S - 1.22
linux/arch/sparc64/mm/init.c - 1.36
linux/arch/sparc64/kernel/smp.c - 1.31
linux/arch/sparc64/kernel/setup.c - 1.25
linux/arch/sparc64/kernel/irq.c - 1.20
linux/arch/sparc64/kernel/ioctl32.c - 1.47
linux/arch/sparc64/kernel/ebus.c - 1.14
linux/arch/sparc64/defconfig - 1.54
linux/arch/sparc64/config.in - 1.46
linux/arch/sparc/mm/sun4c.c - 1.29
linux/arch/sparc/mm/srmmu.c - 1.28
linux/arch/sparc/kernel/smp.c - 1.14
linux/arch/sparc/kernel/setup.c - 1.20
linux/arch/sparc/kernel/process.c - 1.21
linux/arch/sparc/kernel/entry.S - 1.11
linux/arch/sparc/kernel/ebus.c - 1.12
linux/arch/sparc/defconfig - 1.27
linux/arch/i386/kernel/setup.c - 1.61
linux/arch/i386/kernel/io_apic.c - 1.33
linux/arch/i386/kernel/i386_ksyms.c - 1.44
linux/arch/i386/defconfig - 1.83
linux/arch/i386/config.in - 1.68
linux/arch/alpha/kernel/smp.c - 1.27
linux/arch/alpha/kernel/setup.c - 1.24
linux/arch/alpha/kernel/proto.h - 1.17
linux/Makefile - 1.155
linux/Documentation/Configure.help - 1.118
linux/drivers/video/vga16fb.c - 1.13
linux/drivers/atm/suni.c - 1.8
linux/drivers/atm/atmdev_init.c - 1.10
linux/drivers/atm/Config.in - 1.12
linux/include/asm-sparc64/pci.h - 1.10
linux/include/asm-sparc/pci.h - 1.10
linux/drivers/net/pcmcia/pcnet_cs.c - 1.17
linux/drivers/net/pcmcia/3c589_cs.c - 1.20
linux/drivers/video/tdfxfb.c - 1.16
linux/drivers/net/pcmcia/xirc2ps_cs.c - 1.16
linux/drivers/net/pcmcia/3c574_cs.c - 1.18
linux/drivers/net/pcmcia/nmclan_cs.c - 1.14
linux/drivers/net/pcmcia/fmvj18x_cs.c - 1.13
linux/drivers/net/pcmcia/smc91c92_cs.c - 1.14
linux/drivers/net/sk98lin/skvpd.c - 1.5
linux/drivers/sound/trident.c - 1.30
linux/drivers/pcmcia/yenta.c - 1.29
linux/drivers/usb/hid.h - 1.14
linux/arch/ia64/kernel/setup.c - 1.11
linux/include/asm-ia64/scatterlist.h - 1.5
linux/net/bridge/br_stp_bpdu.c - 1.3
linux/drivers/video/matrox/matroxfb_base.c - 1.14
linux/drivers/net/bonding.c - 1.8
linux/drivers/video/riva/fbdev.c - 1.15
linux/drivers/ide/pdc202xx.c - 1.12
linux/drivers/video/sa1100fb.c - 1.11
linux/drivers/usb/serial/ftdi_sio.c - 1.25
linux/drivers/usb/bluetooth.c - 1.18
linux/drivers/usb/storage/freecom.c - 1.8
linux/mm/shmem.c - 1.25
linux/drivers/scsi/osst.c - 1.10
linux/arch/ia64/lib/swiotlb.c - 1.5
linux/drivers/usb/serial/io_usbvend.h - 1.5
linux/drivers/usb/serial/io_tables.h - 1.2
linux/drivers/usb/serial/io_edgeport.c - 1.13
linux/drivers/scsi/aic7xxx/aic7xxx_linux_pci.c - 1.7
linux/arch/sparc64/kernel/isa.c - 1.2
linux/drivers/usb/catc.c - 1.3
linux/drivers/usb/storage/isd200.c - 1.3
linux/drivers/usb/kaweth.c - 1.7
linux/drivers/video/sstfb.c - 1.4
linux/drivers/video/radeonfb.c - 1.6
linux/fs/jffs2/nodelist.c - 1.3
linux/drivers/ide/pdcraid.c - 1.6
linux/net/8021q/vlanproc.c - 1.2
linux/drivers/atm/idt77252.h - 1.2
linux/drivers/atm/idt77252.c - 1.2
linux/fs/ext3/file.c - 1.2
linux/fs/intermezzo/journal.c - 1.2
linux/fs/intermezzo/journal_xfs.c - 1.3
linux/drivers/char/acpi_serial.c - 1.2
linux/fs/intermezzo/methods.c - 1.3
linux/fs/intermezzo/presto.c - 1.2
linux/fs/intermezzo/vfs.c - 1.2
linux/include/linux/intermezzo_fs.h - 1.2
linux/fs/intermezzo/dir.c - 1.2
linux/fs/intermezzo/dcache.c - 1.2
|