Eric pointed out that the patch appeared larger than it should be,
inspection showed that the following files were in there with
different rcs revisions, looks like my merge tool automatically
skips this.
So this is a zero sum mod, it changes some rcs version strings
and that is about it.
Date: Thu Jul 26 15:21:59 PDT 2001
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.4
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: 2.4.x-xfs:slinx:99665a
linux/drivers/isdn/hisax/sedlbauer.c - 1.16
linux/drivers/isdn/hisax/hisax.h - 1.20
linux/drivers/isdn/hisax/elsa.c - 1.14
linux/drivers/isdn/hisax/config.c - 1.22
linux/drivers/isdn/hisax/asuscom.c - 1.12
linux/drivers/isdn/hisax/bkm_a8.c - 1.11
linux/drivers/isdn/hisax/bkm_a4t.c - 1.11
linux/drivers/net/sk98lin/skxmac2.c - 1.5
linux/drivers/net/sk98lin/skgepnmi.c - 1.5
linux/drivers/net/sk98lin/h/skgeinit.h - 1.4
linux/drivers/net/sk98lin/skgesirq.c - 1.5
linux/drivers/net/sk98lin/h/skaddr.h - 1.4
linux/drivers/net/sk98lin/h/skcsum.h - 1.4
linux/drivers/net/sk98lin/h/skdrv1st.h - 1.5
linux/drivers/net/sk98lin/h/skdrv2nd.h - 1.4
linux/drivers/net/sk98lin/skrlmt.c - 1.4
linux/drivers/net/sk98lin/h/skgehw.h - 1.5
linux/drivers/net/sk98lin/skgeinit.c - 1.5
linux/drivers/net/sk98lin/skge.c - 1.12
linux/drivers/net/sk98lin/h/skgepnm2.h - 1.4
linux/drivers/net/sk98lin/h/skgepnmi.h - 1.4
linux/drivers/net/sk98lin/h/skgesirq.h - 1.4
linux/drivers/net/sk98lin/h/ski2c.h - 1.4
linux/drivers/net/sk98lin/h/skrlmt.h - 1.4
linux/drivers/net/sk98lin/h/skvpd.h - 1.4
linux/drivers/net/sk98lin/h/xmac_ii.h - 1.5
linux/drivers/net/sk98lin/skaddr.c - 1.4
linux/drivers/net/sk98lin/skcsum.c - 1.4
linux/drivers/isdn/hisax/hfc_sx.c - 1.8
linux/drivers/isdn/avmb1/b1dma.c - 1.16
linux/drivers/isdn/hysdn/boardergo.c - 1.11
linux/drivers/isdn/hisax/nj_u.c - 1.7
linux/drivers/isdn/hisax/nj_s.c - 1.7
linux/arch/cris/Makefile - 1.5
linux/arch/cris/drivers/ethernet.c - 1.5
linux/arch/cris/drivers/ide.c - 1.5
linux/arch/cris/drivers/serial.c - 1.6
linux/arch/cris/kernel/Makefile - 1.4
linux/arch/cris/kernel/entry.S - 1.6
linux/arch/cris/kernel/head.S - 1.5
linux/arch/cris/kernel/irq.c - 1.5
linux/arch/cris/kernel/process.c - 1.5
linux/arch/cris/kernel/setup.c - 1.5
linux/arch/cris/kernel/sys_cris.c - 1.5
linux/arch/cris/kernel/time.c - 1.3
linux/arch/cris/kernel/traps.c - 1.4
linux/arch/cris/lib/checksum.S - 1.4
linux/arch/cris/lib/checksumcopy.S - 1.4
linux/include/asm-cris/semaphore.h - 1.3
linux/include/asm-cris/delay.h - 1.4
linux/include/asm-cris/dma.h - 1.3
linux/include/asm-cris/irq.h - 1.5
linux/arch/cris/drivers/gpio.c - 1.4
linux/arch/cris/drivers/usb-host.c - 1.4
linux/arch/cris/lib/dram_init.S - 1.4
linux/arch/cris/drivers/ds1302.c - 1.3
linux/arch/cris/drivers/parport.c - 1.3
linux/drivers/mtd/nand/spia.c - 1.3
linux/drivers/mtd/nand/Config.in - 1.3
linux/drivers/isdn/tpam/tpam_main.c - 1.3
linux/drivers/net/sk98lin/h/skversion.h - 1.2
linux/drivers/net/sk98lin/skproc.c - 1.2
linux/drivers/scsi/pcmcia/nsp_cs.c - 1.2
linux/drivers/scsi/pcmcia/nsp_cs.h - 1.2
linux/drivers/scsi/pcmcia/nsp_debug.c - 1.2
linux/drivers/scsi/pcmcia/nsp_io.h - 1.2
linux/arch/cris/drivers/lpslave/bintocarr.pl - 1.2
linux/arch/cris/drivers/lpslave/e100lpslave.S - 1.2
linux/arch/cris/drivers/lpslave/e100lpslavenet.c - 1.2
linux/drivers/char/ser_a2232.c - 1.2
linux/drivers/char/ser_a2232.h - 1.2
linux/drivers/char/ser_a2232fw.h - 1.2
|