[parisc-linux-cvs] linux-2.5 jejb

James Bottomley parisc-linux@lists.parisc-linux.org
Fri, 17 Jan 2003 12:10:41 -0700 (MST)


CVSROOT:	/var/cvs
Module name:	linux-2.5
Changes by:	jejb	03/01/17 12:10:41

Modified files:
	.              : MAINTAINERS Makefile 
	Documentation  : Changes 
	Documentation/crypto: api-intro.txt 
	Documentation/driver-model: bus.txt driver.txt overview.txt 
	Documentation/filesystems: sysfs.txt 
	arch/alpha     : Kconfig Makefile vmlinux.lds.S 
	arch/alpha/boot: Makefile 
	arch/alpha/kernel: Makefile alpha_ksyms.c core_titan.c 
	                   core_tsunami.c core_wildfire.c err_impl.h 
	                   irq.c machvec_impl.h osf_sys.c pci.c 
	                   pci_impl.h pci_iommu.c proto.h setup.c smp.c 
	                   sys_titan.c sys_wildfire.c traps.c 
	arch/alpha/lib : callback_srm.S 
	arch/alpha/mm  : Makefile numa.c 
	arch/arm       : vmlinux-armo.lds.in vmlinux-armv.lds.in 
	arch/arm/kernel: bios32.c calls.S process.c 
	arch/arm/mach-integrator: cpu.c 
	arch/arm/mach-sa1100: cpu-sa1100.c cpu-sa1110.c 
	arch/arm/tools : mach-types 
	arch/cris      : vmlinux.lds.S 
	arch/i386      : Kconfig Makefile defconfig vmlinux.lds.S 
	arch/i386/kernel: acpi.c entry.S io_apic.c mpparse.c smp.c 
	                  smpboot.c 
	arch/i386/kernel/cpu: amd.c proc.c 
	arch/i386/kernel/cpu/cpufreq: gx-suspmod.c 
	arch/ia64      : defconfig vmlinux.lds.S 
	arch/m68k      : Kconfig vmlinux-std.lds vmlinux-sun3.lds 
	arch/m68k/atari: stram.c 
	arch/m68k/kernel: m68k_defs.c m68k_ksyms.c setup.c 
	arch/m68k/mm   : extable.c fault.c 
	arch/m68k/q40  : config.c q40ints.c 
	arch/m68knommu : vmlinux.lds.S 
	arch/m68knommu/kernel: Makefile 
	arch/m68knommu/platform/5307: entry.S 
	arch/m68knommu/platform/68328: entry.S 
	arch/m68knommu/platform/68360: entry.S 
	arch/m68knommu/platform/68EZ328/ucsimm: crt0_ram.S 
	arch/m68knommu/platform/68VZ328/ucdimm: crt0_ram.S 
	arch/mips      : vmlinux.lds.S 
	arch/mips64    : ld.script.elf64 vmlinux.lds.S 
	arch/parisc    : defconfig vmlinux.lds.S 
	arch/ppc       : Makefile vmlinux.lds.S 
	arch/ppc/boot  : ld.script 
	arch/ppc/boot/common: cpc700_memory.c misc-common.c 
	                      mpc10x_memory.c util.S 
	arch/ppc/boot/include: mpc10x.h 
	arch/ppc/boot/simple: Makefile gt64260_tty.c head.S 
	                      misc-ev64260.S misc-spruce.c misc.c 
	                      relocate.S 
	arch/ppc/boot/utils: mkbugboot.c 
	arch/ppc/kernel: asm-offsets.c entry.S head.S head_4xx.S 
	                 ptrace.c smp.c traps.c 
	arch/ppc/platforms: ev64260.h ev64260_setup.c k2.h k2_pci.c 
	                    k2_setup.c lopec_pci.c lopec_serial.h 
	                    lopec_setup.c mcpn765.h mcpn765_pci.c 
	                    mcpn765_serial.h mcpn765_setup.c menf1.h 
	                    menf1_pci.c menf1_setup.c mvme5100.h 
	                    mvme5100_pci.c mvme5100_serial.h 
	                    mvme5100_setup.c pal4.h pal4_pci.c 
	                    pal4_serial.h pal4_setup.c pcore.h 
	                    pcore_pci.c pcore_setup.c powerpmc250.c 
	                    powerpmc250.h powerpmc250_serial.h 
	                    pplus_pci.c pplus_setup.c prpmc750_pci.c 
	                    prpmc750_serial.h prpmc750_setup.c 
	                    prpmc800.h prpmc800_pci.c prpmc800_serial.h 
	                    prpmc800_setup.c sandpoint.h sandpoint_pci.c 
	                    sandpoint_serial.h sandpoint_setup.c 
	                    spruce.h spruce_pci.c spruce_serial.h 
	                    spruce_setup.c zx4500.h zx4500_pci.c 
	                    zx4500_serial.h zx4500_setup.c 
	arch/ppc/platforms/4xx: ash.c ash.h cedar.c cedar.h ep405.c 
	                        ep405.h ibm405gp.c ibm405gp.h 
	                        ibm405gpr.c ibm405gpr.h ibmnp405h.c 
	                        ibmnp405h.h ibmnp405l.c ibmnp405l.h 
	                        ibmnp4gs.c ibmnp4gs.h ibmstb3.c 
	                        ibmstb3.h ibmstb4.c ibmstb4.h 
	                        ibmstbx25.c ibmstbx25.h redwood.c 
	                        redwood.h redwood5.c redwood5.h 
	                        redwood6.c redwood6.h sycamore.c 
	                        sycamore.h walnut.c walnut.h 
	arch/ppc/syslib: cpc700.h cpc700_pic.c cpc710.h gt64260_common.c 
	                 gt64260_pic.c harrier.c mpc10x_common.c 
	                 pci_auto.c ppc405_pci.c ppc4xx_dma.c 
	                 ppc4xx_pm.c ppc4xx_serial.c pplus_common.c 
	                 todc_time.c 
	arch/ppc64     : vmlinux.lds.S 
	arch/ppc64/boot: zImage.lds 
	arch/ppc64/kernel: Makefile entry.S ioctl32.c misc.S ppc_ksyms.c 
	                   process.c signal.c signal32.c sys32.S 
	                   sys_ppc32.c 
	arch/ppc64/mm  : extable.c 
	arch/s390      : vmlinux.lds.S 
	arch/s390x     : vmlinux.lds.S 
	arch/s390x/kernel: entry.S linux32.c linux32.h signal32.c 
	                   wrapper32.S 
	arch/sh        : vmlinux.lds.S 
	arch/sparc     : vmlinux.lds.S 
	arch/sparc64   : Kconfig defconfig vmlinux.lds.S 
	arch/sparc64/kernel: Makefile setup.c sys_sparc32.c 
	arch/um        : uml.lds.S 
	arch/v850      : vmlinux.lds.S 
	arch/x86_64    : Kconfig Makefile defconfig vmlinux.lds.S 
	arch/x86_64/boot: Makefile 
	arch/x86_64/boot/compressed: Makefile 
	arch/x86_64/ia32: fpu32.c ia32_signal.c ia32entry.S sys_ia32.c 
	                  syscall32.c 
	arch/x86_64/kernel: Makefile apic.c entry.S head.S module.c 
	                    process.c ptrace.c setup64.c smpboot.c 
	                    traps.c 
	arch/x86_64/lib: Makefile usercopy.c 
	arch/x86_64/mm : Makefile init.c 
	arch/x86_64/pci: Makefile 
	crypto         : Kconfig Makefile des.c tcrypt.c tcrypt.h 
	drivers        : Makefile 
	drivers/acorn/block: fd1772.c 
	drivers/atm    : nicstar.c 
	drivers/base   : bus.c node.c 
	drivers/block  : elevator.c 
	drivers/char   : Kconfig i8k.c synclink.c synclinkmp.c tty_io.c 
	drivers/char/agp: agp.h ali-agp.c amd-k7-agp.c amd-k8-agp.c 
	                  backend.c frontend.c generic.c hp-agp.c 
	                  i460-agp.c i7x05-agp.c intel-agp.c sis-agp.c 
	                  sworks-agp.c via-agp.c via-kt400.c 
	drivers/char/pcmcia: synclink_cs.c 
	drivers/char/watchdog: acquirewdt.c advantechwdt.c 
	                       alim7101_wdt.c eurotechwdt.c i810-tco.c 
	                       ib700wdt.c indydog.c machzwd.c mixcomwd.c 
	                       pcwd.c sa1100_wdt.c sbc60xxwdt.c 
	                       sc1200wdt.c sc520_wdt.c scx200_wdt.c 
	                       shwdt.c softdog.c w83877f_wdt.c 
	                       wafer5823wdt.c wdt.c wdt285.c wdt977.c 
	                       wdt_pci.c 
	drivers/hotplug: acpiphp_glue.c 
	drivers/ide    : Kconfig 
	drivers/input/keyboard: amikbd.c 
	drivers/input/serio: q40kbd.c 
	drivers/isdn/hisax: config.c hisax_fcpcipnp.c 
	drivers/isdn/i4l: isdn_ppp_ccp.c 
	drivers/media/video: cpia.h cpia_pp.c cpia_usb.c 
	drivers/net    : 3c501.c 3c509.c 3c515.c 3c527.c 3c59x.c Space.c 
	                 hamachi.c isa-skeleton.c myri_sbus.c pcnet32.c 
	                 ptifddi.c seeq8005.c sk_mca.c smc9194.c 
	                 sundance.c tc35815.c via-rhine.c 
	drivers/net/appletalk: cops.c 
	drivers/net/tulip: winbond-840.c 
	drivers/net/wan: sbni.c 
	drivers/parisc : Kconfig 
	drivers/pcmcia : cardbus.c 
	drivers/s390/cio: chsc.c 
	drivers/s390/net: ctcmain.c cu3088.c netiucv.c 
	drivers/sbus/char: display7seg.c 
	drivers/scsi   : mac_scsi.c mac_scsi.h scsi_debug.c 
	drivers/scsi/pcmcia: aha152x_stub.c fdomain_stub.c qlogic_stub.c 
	drivers/serial : sunsab.c 
	drivers/usb/class: bluetty.c cdc-acm.c 
	drivers/usb/core: hcd.c hcd.h usb.c 
	drivers/usb/misc: speedtouch.c 
	drivers/usb/serial: bus.c usb-serial.c 
	drivers/usb/storage: scsiglue.c 
	drivers/video  : Makefile acornfb.c cfbcopyarea.c cfbfillrect.c 
	                 cfbimgblt.c fbmem.c sa1100fb.h tdfxfb.c 
	drivers/video/aty: atyfb.h atyfb_base.c mach64_accel.c 
	drivers/video/console: fbcon.c 
	drivers/video/i810: i810.h i810_accel.c i810_dvt.c i810_main.c 
	                    i810_main.h 
	drivers/video/riva: Makefile fbdev.c riva_hw.c rivafb.h 
	fs             : block_dev.c exec.c quota.c 
	fs/devfs       : Makefile base.c util.c 
	fs/devpts      : inode.c 
	fs/ext3        : ialloc.c inode.c namei.c 
	fs/hugetlbfs   : inode.c 
	fs/intermezzo  : vfs.c 
	fs/jbd         : checkpoint.c commit.c transaction.c 
	fs/partitions  : sgi.c 
	fs/proc        : Makefile array.c base.c inode.c proc_misc.c 
	fs/xfs         : xfs_dir.c xfs_dir2.c xfs_inode.h 
	                 xfs_log_recover.c xfs_rename.c xfs_utils.c 
	                 xfs_vfsops.c xfs_vnodeops.c 
	fs/xfs/linux   : xfs_linux.h xfs_lrw.c xfs_vnode.h 
	fs/xfs/pagebuf : page_buf.c 
	fs/xfs/support : debug.c 
	include/asm-alpha: agp.h console.h core_titan.h hardirq.h 
	                   hwrpb.h ide.h io.h irq.h machvec.h mmzone.h 
	                   numnodes.h pci.h pgalloc.h pgtable.h smp.h 
	                   system.h topology.h 
	include/asm-arm: ide.h unistd.h 
	include/asm-arm/arch-integrator: memory.h 
	include/asm-generic: topology.h 
	include/asm-i386: apicdef.h module.h mpspec.h smp.h topology.h 
	include/asm-i386/mach-bigsmp: mach_apic.h 
	include/asm-i386/mach-default: mach_apic.h mach_mpparse.h 
	include/asm-i386/mach-numaq: mach_apic.h mach_mpparse.h 
	include/asm-i386/mach-summit: mach_apic.h mach_mpparse.h 
	include/asm-ia64: topology.h 
	include/asm-m68k: machdep.h mmu_context.h q40ints.h rtc.h 
	                  uaccess.h 
	include/asm-m68knommu: entry.h page.h 
	include/asm-ppc: gt64260.h gt64260_defs.h harrier.h ibm403.h 
	                 ibm405.h ibm_ocp_pci.h mpc10x.h ppc405_dma.h 
	                 pplus.h processor.h rtc.h todc.h 
	include/asm-ppc64: module.h page.h topology.h 
	include/asm-s390x: compat.h 
	include/asm-sparc64: bug.h 
	include/asm-x86_64: compat.h ia32.h mmu_context.h page.h proto.h 
	                    ptrace.h segment.h uaccess.h 
	include/linux  : compat.h cpufreq.h devfs_fs_kernel.h ext3_fs.h 
	                 ext3_jbd.h font.h fs.h i2c.h jbd.h kobject.h 
	                 miscdevice.h mm.h mmzone.h module.h netdevice.h 
	                 sched.h tty_driver.h usb.h xattr.h 
	init           : Kconfig Makefile main.c 
	kernel         : compat.c exit.c fork.c kallsyms.c module.c 
	                 sched.c 
	lib            : kobject.c 
	mm             : mmap.c page_alloc.c readahead.c 
	net            : netsyms.c 
	net/atm        : mpc.c 
	net/core       : dev.c rtnetlink.c 
	scripts        : Makefile.build per-cpu-check.awk 
	sound          : Kconfig 
	sound/oss      : soundcard.c 
Added files:
	arch/alpha/kernel: core_marvel.c err_marvel.c err_titan.c gct.c 
	                   sys_marvel.c 
	arch/alpha/mm  : remap.c 
	arch/ppc/ocp   : Makefile ocp-driver.c ocp-probe.c ocp.c 
	arch/ppc64/kernel: module.c 
	arch/sparc64/kernel: us3_cpufreq.c 
	crypto         : sha512.c 
	drivers/eisa   : Kconfig Makefile eisa-bus.c eisa.ids 
	drivers/video/riva: nv_driver.c 
	fs/devfs       : internal.h 
	fs/proc        : task_mmu.c task_nommu.c 
	include/asm-alpha: agp_backend.h core_marvel.h gct.h 
	include/asm-generic: vmlinux.lds.h 
	include/asm-m68knommu: bug.h 
	include/asm-ppc64: bug.h 
	include/asm-x86_64: bug.h 
	include/linux  : eisa.h 
	init           : vermagic.c 
Removed files:
	arch/m68knommu/platform/68VZ328/de2: himem.ld 
	arch/x86_64/mm : modutil.c 

Log message:
Merged Successfully