Merge branch 'upstream'

2026-09-18 18:15:59 +00:00 · 2005-11-29 03:57:29 -05:00 · 2005-11-29 03:57:29 -05:00 · 5f3fdeb624
commit 5f3fdeb624
parent 98a5d024eb b71d4da092
282 changed files with 3454 additions and 2941 deletions
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/arm/VFP/release-notes.txt
+++ b/Documentation/arm/VFP/release-notes.txt
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
--- a/Documentation/filesystems/affs.txt
+++ b/Documentation/filesystems/affs.txt
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
--- a/Documentation/floppy.txt
+++ b/Documentation/floppy.txt
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
--- a/Documentation/mca.txt
+++ b/Documentation/mca.txt
--- a/Documentation/networking/driver.txt
+++ b/Documentation/networking/driver.txt
--- a/Documentation/networking/ifenslave.c
+++ b/Documentation/networking/ifenslave.c
--- a/Documentation/networking/iphase.txt
+++ b/Documentation/networking/iphase.txt
--- a/Documentation/networking/irda.txt
+++ b/Documentation/networking/irda.txt
--- a/Documentation/networking/ray_cs.txt
+++ b/Documentation/networking/ray_cs.txt
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
--- a/Documentation/power/pci.txt
+++ b/Documentation/power/pci.txt
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
--- a/Documentation/usb/ibmcam.txt
+++ b/Documentation/usb/ibmcam.txt
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
--- a/Documentation/usb/rio.txt
+++ b/Documentation/usb/rio.txt
--- a/Documentation/video4linux/zr36120.txt
+++ b/Documentation/video4linux/zr36120.txt
--- a/25
+++ b/25
--- a/2
+++ b/2
--- a/arch/arm/configs/corgi_defconfig
+++ b/arch/arm/configs/corgi_defconfig
--- a/arch/arm/configs/poodle_defconfig
+++ b/arch/arm/configs/poodle_defconfig
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- a/arch/frv/kernel/semaphore.c
+++ b/arch/frv/kernel/semaphore.c
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
--- a/arch/m32r/kernel/io_mappi3.c
+++ b/arch/m32r/kernel/io_mappi3.c
--- a/arch/m32r/kernel/setup_mappi3.c
+++ b/arch/m32r/kernel/setup_mappi3.c
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
--- a/arch/powerpc/mm/4xx_mmu.c
+++ b/arch/powerpc/mm/4xx_mmu.c
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
--- a/arch/powerpc/mm/tlb_32.c
+++ b/arch/powerpc/mm/tlb_32.c
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
--- a/arch/powerpc/sysdev/dart.h
+++ b/arch/powerpc/sysdev/dart.h
--- a/arch/powerpc/sysdev/u3_iommu.c
+++ b/arch/powerpc/sysdev/u3_iommu.c
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
--- a/arch/um/include/sysdep-i386/stub.h
+++ b/arch/um/include/sysdep-i386/stub.h
--- a/arch/um/include/sysdep-x86_64/stub.h
+++ b/arch/um/include/sysdep-x86_64/stub.h
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
--- a/arch/um/sys-i386/stub_segv.c
+++ b/arch/um/sys-i386/stub_segv.c
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
--- a/arch/um/sys-x86_64/stub_segv.c
+++ b/arch/um/sys-x86_64/stub_segv.c
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/char/drm/drm_memory.c
--- a/drivers/char/drm/drm_memory_debug.h
+++ b/drivers/char/drm/drm_memory_debug.h
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/Show more
+++ b/Show more