Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD

2026-09-16 18:15:52 +00:00 · 2005-05-26 13:03:24 -04:00 · 2005-05-26 13:03:24 -04:00 · 8973a585ae
commit 8973a585ae
parent 907f4678c1 bef9c55884
366 changed files with 14825 additions and 7552 deletions
--- a/5
+++ b/5
--- a/Documentation/cpusets.txt
+++ b/Documentation/cpusets.txt
--- a/Documentation/dvb/README.flexcop
+++ b/Documentation/dvb/README.flexcop
--- a/Documentation/dvb/bt8xx.txt
+++ b/Documentation/dvb/bt8xx.txt
--- a/Documentation/dvb/ci.txt
+++ b/Documentation/dvb/ci.txt
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/sysfs-pci.txt
+++ b/Documentation/filesystems/sysfs-pci.txt
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/powerpc/hvcs.txt
+++ b/Documentation/powerpc/hvcs.txt
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/4
+++ b/4
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
--- a/arch/arm/mach-s3c2410/s3c2440.c
+++ b/arch/arm/mach-s3c2410/s3c2440.c
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
--- a/arch/arm/mm/copypage-v4mc.S
+++ b/arch/arm/mm/copypage-v4mc.S
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
--- a/arch/arm/mm/copypage-v6.c
+++ b/arch/arm/mm/copypage-v6.c
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
--- a/arch/ia64/ia32/ia32_ioctl.c
+++ b/arch/ia64/ia32/ia32_ioctl.c
--- a/arch/mips/vr41xx/common/pmu.c
+++ b/arch/mips/vr41xx/common/pmu.c
--- a/arch/ppc/kernel/head_44x.S
+++ b/arch/ppc/kernel/head_44x.S
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
--- a/arch/ppc/lib/string.S
+++ b/arch/ppc/lib/string.S
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
--- a/arch/ppc/syslib/ipic.c
+++ b/arch/ppc/syslib/ipic.c
--- a/arch/ppc/syslib/mpc83xx_devices.c
+++ b/arch/ppc/syslib/mpc83xx_devices.c
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/arch/ppc/syslib/mpc85xx_devices.c
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
--- a/arch/ppc64/kernel/mf.c
+++ b/arch/ppc64/kernel/mf.c
--- a/arch/ppc64/kernel/pmac_smp.c
+++ b/arch/ppc64/kernel/pmac_smp.c
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
--- a/arch/ppc64/kernel/rtc.c
+++ b/arch/ppc64/kernel/rtc.c
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
--- a/arch/um/Kconfig_x86_64
+++ b/arch/um/Kconfig_x86_64
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
--- a/arch/um/drivers/mcast_kern.c
+++ b/arch/um/drivers/mcast_kern.c
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
--- a/arch/um/include/sysdep-i386/ptrace.h
+++ b/arch/um/include/sysdep-i386/ptrace.h
--- a/arch/um/include/sysdep-x86_64/checksum.h
+++ b/arch/um/include/sysdep-x86_64/checksum.h
--- a/arch/um/include/sysdep-x86_64/ptrace.h
+++ b/arch/um/include/sysdep-x86_64/ptrace.h
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
--- a/arch/um/kernel/checksum.c
+++ b/arch/um/kernel/checksum.c
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
--- a/arch/um/kernel/irq_user.c
+++ b/arch/um/kernel/irq_user.c
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
--- a/arch/um/kernel/trap_kern.c
+++ b/arch/um/kernel/trap_kern.c
--- a/arch/um/kernel/tt/ksyms.c
+++ b/arch/um/kernel/tt/ksyms.c
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
--- a/arch/um/sys-i386/delay.c
+++ b/arch/um/sys-i386/delay.c
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
--- a/arch/um/sys-x86_64/delay.c
+++ b/arch/um/sys-x86_64/delay.c
--- a/arch/um/sys-x86_64/ksyms.c
+++ b/arch/um/sys-x86_64/ksyms.c
--- a/arch/um/sys-x86_64/ptrace.c
+++ b/arch/um/sys-x86_64/ptrace.c
--- a/arch/um/sys-x86_64/syscalls.c
+++ b/arch/um/sys-x86_64/syscalls.c
--- a/arch/um/sys-x86_64/user-offsets.c
+++ b/arch/um/sys-x86_64/user-offsets.c
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
--- 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/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/pmtimer.c
+++ b/arch/x86_64/kernel/pmtimer.c
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/signal.c
+++ b/arch/x86_64/kernel/signal.c
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
--- a/arch/x86_64/kernel/x8664_ksyms.c
+++ b/arch/x86_64/kernel/x8664_ksyms.c
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86_64/mm/ioremap.c
--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
--- a/crypto/internal.h
+++ b/crypto/internal.h
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/base/interface.c
+++ b/drivers/base/interface.c
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
--- a/Show more
+++ b/Show more