Merge branch 'upstream'

2026-09-16 18:15:52 +00:00 · 2006-02-20 05:13:31 -05:00 · 2006-02-20 05:13:31 -05:00 · ff60774859
commit ff60774859
parent db024d5398 6aff8f1f07
336 changed files with 5510 additions and 3232 deletions
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/fujitsu/frv/kernel-ABI.txt
+++ b/Documentation/fujitsu/frv/kernel-ABI.txt
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/mips/AU1xxx_IDE.README
+++ b/Documentation/mips/AU1xxx_IDE.README
--- a/Documentation/scsi/ChangeLog.megaraid_sas
+++ b/Documentation/scsi/ChangeLog.megaraid_sas
--- a/9
+++ b/9
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
--- a/arch/arm/mach-integrator/platsmp.c
+++ b/arch/arm/mach-integrator/platsmp.c
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
--- a/arch/arm/mach-iop3xx/iop331-setup.c
+++ b/arch/arm/mach-iop3xx/iop331-setup.c
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
--- a/arch/frv/Makefile
+++ b/arch/frv/Makefile
--- a/arch/frv/kernel/break.S
+++ b/arch/frv/kernel/break.S
--- a/arch/frv/kernel/entry-table.S
+++ b/arch/frv/kernel/entry-table.S
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
--- a/arch/frv/kernel/head.S
+++ b/arch/frv/kernel/head.S
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
--- a/arch/frv/mm/kmap.c
+++ b/arch/frv/mm/kmap.c
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
--- a/arch/i386/boot/.gitignore
+++ b/arch/i386/boot/.gitignore
--- a/arch/i386/boot/tools/.gitignore
+++ b/arch/i386/boot/tools/.gitignore
--- a/arch/i386/kernel/.gitignore
+++ b/arch/i386/kernel/.gitignore
--- a/arch/i386/kernel/cpu/transmeta.c
+++ b/arch/i386/kernel/cpu/transmeta.c
--- a/arch/i386/kernel/timers/timer_tsc.c
+++ b/arch/i386/kernel/timers/timer_tsc.c
--- a/arch/i386/kernel/vsyscall-sysenter.S
+++ b/arch/i386/kernel/vsyscall-sysenter.S
--- a/arch/i386/oprofile/backtrace.c
+++ b/arch/i386/oprofile/backtrace.c
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
--- a/arch/ia64/sn/kernel/sn2/prominfo_proc.c
+++ b/arch/ia64/sn/kernel/sn2/prominfo_proc.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_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
--- a/arch/ia64/sn/kernel/sn2/timer.c
+++ b/arch/ia64/sn/kernel/sn2/timer.c
--- a/arch/ia64/sn/kernel/sn2/timer_interrupt.c
+++ b/arch/ia64/sn/kernel/sn2/timer_interrupt.c
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_ate.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
--- a/arch/mips/kernel/smp_mt.c
+++ b/arch/mips/kernel/smp_mt.c
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
--- a/arch/mips/mm/c-tx39.c
+++ b/arch/mips/mm/c-tx39.c
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
--- a/arch/sparc/kernel/systbls.S
+++ b/arch/sparc/kernel/systbls.S
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86_64/kernel/head.S
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
--- a/arch/x86_64/mm/k8topology.c
+++ b/arch/x86_64/mm/k8topology.c
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
--- a/arch/x86_64/mm/srat.c
+++ b/arch/x86_64/mm/srat.c
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
--- a/Show more
+++ b/Show more