Hope this works, we're all off to Ottawa tomorrow. :)
Merge up to 2.4.19-rc1
Date: Mon Jun 24 14:35:10 PDT 2002
Workarea: stout.americas.sgi.com:/localhome/src/sandeen/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:122256a
linux/scripts/patch-kernel - 1.6
linux/net/packet/af_packet.c - 1.29
linux/net/ipv4/ipconfig.c - 1.28
linux/net/802/Makefile - 1.6
linux/mm/swapfile.c - 1.49
linux/mm/page_io.c - 1.20
linux/mm/page_alloc.c - 1.73
linux/mm/filemap.c - 1.112
linux/kernel/signal.c - 1.22
linux/kernel/panic.c - 1.17
linux/kernel/ksyms.c - 1.128
linux/include/linux/serial.h - 1.17
linux/include/linux/kdev_t.h - 1.6
linux/include/asm-alpha/unistd.h - 1.17
linux/fs/ufs/super.c - 1.23
linux/fs/read_write.c - 1.17
linux/fs/fcntl.c - 1.18
linux/drivers/video/Config.in - 1.33
linux/drivers/usb/audio.c - 1.36
linux/drivers/sound/sound_config.h - 1.6
linux/drivers/scsi/scsi_error.c - 1.22
linux/drivers/scsi/jazz_esp.c - 1.7
linux/drivers/net/hamradio/soundmodem/smdma.h - 1.3
linux/drivers/net/hamradio/soundmodem/sm_wss.c - 1.7
linux/drivers/net/hamradio/soundmodem/sm_sbc.c - 1.6
linux/drivers/net/hamradio/soundmodem/sm_afsk2666.c - 1.3
linux/drivers/net/hamradio/soundmodem/sm_afsk2400_8.c - 1.3
linux/drivers/net/hamradio/soundmodem/sm_afsk2400_7.c - 1.3
linux/drivers/net/hamradio/soundmodem/sm_afsk1200.c - 1.3
linux/drivers/net/hamradio/soundmodem/sm.h - 1.9
linux/drivers/net/hamradio/baycom_ser_fdx.c - 1.17
linux/drivers/net/hamradio/baycom_epp.c - 1.19
linux/drivers/net/3c501.c - 1.17
linux/drivers/isdn/pcbit/capi.h - 1.5
linux/drivers/isdn/isdn_common.c - 1.32
linux/drivers/isdn/act2000/capi.h - 1.8
linux/drivers/isdn/act2000/act2000.h - 1.8
linux/drivers/char/specialix.c - 1.13
linux/drivers/char/serial.c - 1.55
linux/drivers/char/pc_keyb.c - 1.28
linux/drivers/char/isicom.c - 1.16
linux/drivers/char/ftape/zftape/zftape-vtbl.h - 1.3
linux/drivers/char/ftape/lowlevel/ftape-rw.h - 1.4
linux/drivers/block/rd.c - 1.44
linux/drivers/block/nbd.c - 1.27
linux/drivers/block/genhd.c - 1.23
linux/arch/ppc/mm/init.c - 1.40
linux/arch/i386/kernel/setup.c - 1.66
linux/arch/i386/kernel/apm.c - 1.39
linux/arch/i386/defconfig - 1.87
linux/Makefile - 1.172
linux/Documentation/scsi.txt - 1.4
linux/Documentation/scsi-generic.txt - 1.10
linux/Documentation/networking/ip-sysctl.txt - 1.12
linux/Documentation/kernel-docs.txt - 1.9
linux/Documentation/Configure.help - 1.133
linux/CREDITS - 1.71
linux/drivers/video/cyber2000fb.h - 1.13
linux/drivers/video/cyber2000fb.c - 1.29
linux/drivers/isdn/eicon/eicon.h - 1.14
linux/drivers/net/arlan.c - 1.23
linux/fs/partitions/check.c - 1.36
linux/fs/partitions/Makefile - 1.8
linux/include/asm-i386/pci.h - 1.15
linux/drivers/pcmcia/Config.in - 1.12
linux/include/linux/pci_ids.h - 1.58
linux/fs/proc/proc_misc.c - 1.30
linux/drivers/pci/pci.ids - 1.43
linux/drivers/sound/trident.h - 1.14
linux/drivers/net/aironet4500.h - 1.10
linux/drivers/char/agp/agpgart_be.c - 1.32
linux/drivers/char/agp/agp.h - 1.22
linux/drivers/ieee1394/Config.in - 1.7
linux/drivers/scsi/3w-xxxx.h - 1.10
linux/drivers/scsi/3w-xxxx.c - 1.17
linux/drivers/net/8139too.c - 1.37
linux/drivers/net/skfp/h/smt.h - 1.3
linux/drivers/net/bonding.c - 1.12
linux/include/linux/if_bonding.h - 1.6
linux/drivers/video/riva/fbdev.c - 1.19
linux/drivers/ide/piix.c - 1.15
linux/drivers/ide/ide-pci.c - 1.20
linux/drivers/ide/ide-disk.c - 1.20
linux/drivers/ide/ide-cd.c - 1.22
linux/net/ipv4/netfilter/ipchains_core.c - 1.11
linux/arch/i386/kernel/pci-irq.c - 1.21
linux/Documentation/sound/PAS16 - 1.3
linux/fs/partitions/ibm.c - 1.10
linux/drivers/s390/char/con3215.c - 1.8
linux/drivers/s390/block/dasd.c - 1.19
linux/include/linux/sisfb.h - 1.5
linux/drivers/char/i810_rng.c - 1.9
linux/drivers/media/video/videodev.c - 1.11
linux/drivers/media/video/pms.c - 1.7
linux/drivers/media/video/bw-qcam.c - 1.9
linux/drivers/char/i810-tco.h - 1.3
linux/drivers/char/i810-tco.c - 1.11
linux/include/asm-i386/xor.h - 1.3
linux/arch/alpha/lib/ev6-memset.S - 1.2
linux/mm/shmem.c - 1.30
linux/Documentation/DocBook/sis900.tmpl - 1.2
linux/drivers/acpi/acpi_ksyms.c - 1.6
linux/drivers/s390/net/fsm.h - 1.4
linux/Documentation/i810_rng.txt - 1.4
linux/drivers/s390/char/tubio.h - 1.4
linux/arch/ppc/boot/chrp/start.c - 1.3
linux/drivers/net/au1000_eth.c - 1.5
linux/drivers/char/w83877f_wdt.c - 1.5
linux/drivers/message/fusion/linux_compat.h - 1.3
linux/drivers/s390/block/dasd_int.h - 1.5
linux/drivers/video/sstfb.c - 1.7
linux/drivers/video/radeonfb.c - 1.11
linux/drivers/sound/nec_vrc5477.c - 1.5
linux/drivers/sound/ite8172.c - 1.6
linux/drivers/net/ns83820.c - 1.10
linux/include/asm-ppc/commproc.h - 1.2
linux/drivers/net/8139cp.c - 1.7
linux/drivers/isdn/hisax/hisax_fcpcipnp.c - 1.4
linux/drivers/video/tridentfb.h - 1.3
linux/drivers/video/tridentfb.c - 1.4
linux/drivers/block/umem.c - 1.3
linux/drivers/char/hcdp_serial.c - 1.2
linux/drivers/net/tg3.c - 1.3
linux/drivers/net/tg3.h - 1.3
linux/drivers/net/wan/8253x/8253xmode.c - 1.2
linux/init/do_mounts.c - 1.2
linux/drivers/net/wan/8253x/Makefile - 1.3
linux/drivers/net/wan/8253x/clean - 1.2
linux/drivers/net/wan/8253x/crc32.c - 1.2
linux/drivers/net/wan/8253x/crc32dcl.h - 1.2
linux/include/linux/hcdp_serial.h - 1.2
linux/drivers/scsi/aic7xxx/aic7xxx_core.c - 1.2
linux/drivers/sound/au1000.c - 1.3
linux/arch/ppc/boot/common/relocate.S - 1.2
linux/drivers/usb/emi26.c - 1.2
linux/drivers/video/neofb.c - 1.2
|