Merge some lost 2.4 differences... not sure what happened to these.
Date: Tue Feb 24 18:07:34 PST 2004
Workarea: sherman.melbourne.sgi.com:/build/nathans/2.4.x-xfs
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/linux/2.4.x-xfs
Modid: 2.4.x-xfs:linux:167434a
arch/ppc/platforms/sandpoint_serial.h - 1.1
drivers/net/wan/pci200syn.c - 1.1
Documentation/i2c/i2c-velleman - 1.1
drivers/char/mpc8xx_wdt.c - 1.1
arch/ppc/platforms/sandpoint.c - 1.1
arch/ppc/platforms/prpmc750_serial.h - 1.1
arch/ppc/platforms/prpmc750.h - 1.1
arch/ppc/platforms/prpmc750.c - 1.1
arch/ppc/kernel/m8xx_wdt.c - 1.1
arch/ppc/boot/simple/clear.S - 1.1
Documentation/Configure.help - 1.10
Documentation/SubmittingDrivers - 1.3
Documentation/i2c/summary - 1.3
MAINTAINERS - 1.6
arch/ppc/boot/Makefile - 1.3
arch/ppc/boot/chrp/Makefile - 1.3
arch/ppc/boot/common/misc-simple.c - 1.3
arch/ppc/boot/pmac/Makefile - 1.3
arch/ppc/boot/simple/Makefile - 1.3
arch/ppc/boot/utils/mkprep.c - 1.3
arch/ppc/config.in - 1.5
arch/ppc/configs/IVMS8_defconfig - 1.5
arch/ppc/configs/SM850_defconfig - 1.5
arch/ppc/configs/SPD823TS_defconfig - 1.5
arch/ppc/configs/TQM823L_defconfig - 1.5
arch/ppc/configs/TQM850L_defconfig - 1.5
arch/ppc/configs/TQM860L_defconfig - 1.5
arch/ppc/configs/apus_defconfig - 1.4
arch/ppc/configs/briq_defconfig - 1.4
arch/ppc/configs/bseip_defconfig - 1.5
arch/ppc/configs/common_defconfig - 1.4
arch/ppc/configs/ebony_defconfig - 1.4
arch/ppc/configs/est8260_defconfig - 1.4
arch/ppc/configs/gemini_defconfig - 1.4
arch/ppc/configs/ibmchrp_defconfig - 1.4
arch/ppc/configs/mbx_defconfig - 1.5
arch/ppc/configs/oak_defconfig - 1.4
arch/ppc/configs/ocotea_defconfig - 1.4
arch/ppc/configs/pal4_defconfig - 1.4
arch/ppc/configs/pmac_defconfig - 1.4
arch/ppc/configs/power3_defconfig - 1.4
arch/ppc/configs/pplus_defconfig - 1.4
arch/ppc/configs/rpxcllf_defconfig - 1.5
arch/ppc/configs/rpxlite_defconfig - 1.5
arch/ppc/configs/spruce_defconfig - 1.4
arch/ppc/configs/walnut_defconfig - 1.4
arch/ppc/defconfig - 1.4
arch/ppc/kernel/Makefile - 1.3
arch/ppc/kernel/m8xx_setup.c - 1.3
arch/ppc/kernel/open_pic.c - 1.4
arch/ppc/kernel/ppc_ksyms.c - 1.3
arch/ppc/kernel/setup.c - 1.3
arch/ppc/platforms/Makefile - 1.4
arch/ppc/platforms/ebony.c - 1.3
arch/ppc/platforms/ebony.h - 1.3
arch/ppc/platforms/gemini_serial.h - 1.3
arch/ppc/platforms/ibm405gp.h - 1.3
arch/ppc/platforms/lopec_serial.h - 1.3
arch/ppc/platforms/lopec_setup.c - 1.3
arch/ppc/platforms/ocotea.c - 1.3
arch/ppc/platforms/ocotea.h - 1.3
arch/ppc/platforms/pal4_serial.h - 1.3
arch/ppc/platforms/spruce.h - 1.3
arch/ppc/platforms/spruce_setup.c - 1.3
arch/sparc64/defconfig - 1.4
arch/sparc64/kernel/pci_sabre.c - 1.3
drivers/block/cciss.c - 1.3
drivers/block/genhd.c - 1.3
drivers/char/Config.in - 1.4
drivers/char/Makefile - 1.4
drivers/i2c/Config.in - 1.4
drivers/i2c/i2c-adap-ite.c - 1.3
drivers/i2c/i2c-algo-bit.c - 1.3
drivers/i2c/i2c-algo-ite.c - 1.3
drivers/i2c/i2c-algo-pcf.c - 1.3
drivers/i2c/i2c-core.c - 1.4
drivers/i2c/i2c-dev.c - 1.3
drivers/i2c/i2c-elektor.c - 1.3
drivers/i2c/i2c-elv.c - 1.3
drivers/i2c/i2c-keywest.c - 1.3
drivers/i2c/i2c-philips-par.c - 1.4
drivers/i2c/i2c-proc.c - 1.3
drivers/i2c/i2c-velleman.c - 1.3
drivers/ide/raid/pdcraid.c - 1.3
drivers/md/lvm-snap.c - 1.3
drivers/md/lvm.c - 1.3
drivers/md/raid5.c - 1.3
drivers/media/video/Makefile - 1.4
drivers/net/tokenring/Config.in - 1.3
drivers/net/wan/Config.in - 1.4
drivers/net/wan/Makefile - 1.3
drivers/net/wan/c101.c - 1.3
drivers/net/wan/hd64572.h - 1.3
drivers/net/wan/hd6457x.c - 1.3
drivers/net/wan/hdlc_cisco.c - 1.3
drivers/net/wan/hdlc_fr.c - 1.3
drivers/net/wan/hdlc_generic.c - 1.3
drivers/net/wan/hdlc_ppp.c - 1.3
drivers/net/wan/hdlc_raw.c - 1.3
drivers/net/wan/hdlc_raw_eth.c - 1.3
drivers/net/wan/hdlc_x25.c - 1.3
drivers/net/wan/n2.c - 1.3
drivers/video/clgenfb.c - 1.3
drivers/video/hgafb.c - 1.3
fs/readdir.c - 1.4
include/net/pkt_cls.h - 1.3
mm/mmap.c - 1.3
net/core/dev.c - 1.3
net/core/neighbour.c - 1.3
net/sched/cls_api.c - 1.3
net/sched/sch_atm.c - 1.3
net/sched/sch_cbq.c - 1.3
net/sched/sch_csz.c - 1.3
net/sched/sch_dsmark.c - 1.3
net/sched/sch_htb.c - 1.3
net/sched/sch_ingress.c - 1.3
net/sched/sch_prio.c - 1.3
net/sched/sch_tbf.c - 1.3
|