Merge branch 'upstream'

Conflicts: drivers/scsi/libata-core.c
2026-09-16 18:15:52 +00:00 · 2006-03-24 12:29:39 -05:00 · 2006-03-24 12:29:39 -05:00 · 4bbf7bc4c7
commit 4bbf7bc4c7
parent 84ac69e8bf aec5c3c1a9
1290 changed files with 40381 additions and 24162 deletions
--- a/Documentation/DocBook/deviceiobook.tmpl
+++ b/Documentation/DocBook/deviceiobook.tmpl
--- a/Documentation/cpusets.txt
+++ b/Documentation/cpusets.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
--- a/Documentation/hwmon/w83781d
+++ b/Documentation/hwmon/w83781d
--- a/Documentation/i2c/busses/i2c-piix4
+++ b/Documentation/i2c/busses/i2c-piix4
--- a/Documentation/i2c/busses/scx200_acb
+++ b/Documentation/i2c/busses/scx200_acb
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/networking/pktgen.txt
+++ b/Documentation/networking/pktgen.txt
--- a/Documentation/nfsroot.txt
+++ b/Documentation/nfsroot.txt
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
--- a/Documentation/power/userland-swsusp.txt
+++ b/Documentation/power/userland-swsusp.txt
--- a/Documentation/power/video.txt
+++ b/Documentation/power/video.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt
--- a/Documentation/powerpc/hvcs.txt
+++ b/Documentation/powerpc/hvcs.txt
--- a/Documentation/s390/driver-model.txt
+++ b/Documentation/s390/driver-model.txt
--- a/Documentation/w1/masters/ds2482
+++ b/Documentation/w1/masters/ds2482
--- a/11
+++ b/11
--- a/4
+++ b/4
--- a/arch/arm/mach-pxa/leds-mainstone.c
+++ b/arch/arm/mach-pxa/leds-mainstone.c
--- a/arch/arm/mach-s3c2410/cpu.c
+++ b/arch/arm/mach-s3c2410/cpu.c
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/alternative.c
+++ b/arch/i386/kernel/alternative.c
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
--- a/arch/i386/kernel/cpu/centaur.c
+++ b/arch/i386/kernel/cpu/centaur.c
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/i386/kernel/cpu/intel.c
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
--- a/arch/i386/kernel/module.c
+++ b/arch/i386/kernel/module.c
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
--- a/arch/i386/kernel/semaphore.c
+++ b/arch/i386/kernel/semaphore.c
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/topology.c
+++ b/arch/i386/kernel/topology.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
--- a/arch/i386/kernel/vsyscall-sysenter.S
+++ b/arch/i386/kernel/vsyscall-sysenter.S
--- a/arch/i386/mach-es7000/es7000.h
+++ b/arch/i386/mach-es7000/es7000.h
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
--- a/arch/i386/mach-visws/reboot.c
+++ b/arch/i386/mach-visws/reboot.c
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
--- a/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
--- 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/init.c
+++ b/arch/i386/pci/init.c
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
--- a/arch/mips/mm/dma-ip32.c
+++ b/arch/mips/mm/dma-ip32.c
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/boot/install.sh
+++ b/arch/powerpc/boot/install.sh
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_defconfig
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
--- a/arch/powerpc/kernel/firmware.c
+++ b/arch/powerpc/kernel/firmware.c
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
--- a/arch/powerpc/kernel/head_booke.h
+++ b/arch/powerpc/kernel/head_booke.h
--- a/Show more
+++ b/Show more