Merge up to 2.4.15-pre6
Date: Mon Nov 19 16:04:46 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:107058a
linux/arch/ppc/lib/dec_and_lock.c - 1.1
linux/include/linux/wait.h - 1.12
linux/include/asm-ppc/machdep.h - 1.20
linux/fs/proc/inode.c - 1.16
linux/fs/inode.c - 1.56
linux/drivers/pci/proc.c - 1.22
linux/drivers/char/vt.c - 1.23
linux/drivers/cdrom/cdrom.c - 1.36
linux/arch/ppc/lib/Makefile - 1.8
linux/arch/ppc/kernel/setup.c - 1.37
linux/arch/ppc/kernel/prep_setup.c - 1.27
linux/arch/ppc/kernel/ppc_ksyms.c - 1.38
linux/arch/ppc/kernel/pmac_setup.c - 1.27
linux/arch/ppc/kernel/pci.c - 1.23
linux/arch/ppc/kernel/chrp_setup.c - 1.27
linux/arch/ppc/kernel/apus_setup.c - 1.20
linux/arch/ppc/config.in - 1.41
linux/arch/arm/kernel/setup.c - 1.23
linux/arch/alpha/kernel/time.c - 1.20
linux/arch/alpha/kernel/setup.c - 1.25
linux/Makefile - 1.156
linux/MAINTAINERS - 1.84
linux/arch/ppc/kernel/gemini_setup.c - 1.20
linux/arch/sh/kernel/setup.c - 1.17
linux/arch/ppc/kernel/m8xx_setup.c - 1.20
linux/fs/proc/proc_misc.c - 1.26
linux/arch/ppc/kernel/oak_setup.c - 1.9
linux/drivers/char/agp/agpgart_be.c - 1.28
linux/arch/ppc/kernel/walnut_setup.c - 1.6
linux/arch/ppc/kernel/m8260_setup.c - 1.13
linux/arch/s390/kernel/setup.c - 1.6
linux/scripts/Lindent - 1.3
linux/arch/s390x/kernel/setup.c - 1.5
linux/fs/seq_file.c - 1.3
|