Merge branch 'master' into upstream

2026-09-16 18:15:52 +00:00 · 2006-09-27 18:13:53 -04:00 · 2006-09-27 18:13:53 -04:00 · aebb1153ac
commit aebb1153ac
parent 022e7a12b6 a77c64c1a6
1466 changed files with 62432 additions and 28374 deletions
--- a/Documentation/ABI/obsolete/devfs
+++ b/Documentation/ABI/obsolete/devfs
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/i2c/busses/i2c-viapro
+++ b/Documentation/i2c/busses/i2c-viapro
--- a/Documentation/i2c/i2c-stub
+++ b/Documentation/i2c/i2c-stub
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/nommu-mmap.txt
+++ b/Documentation/nommu-mmap.txt
--- a/Documentation/pcieaer-howto.txt
+++ b/Documentation/pcieaer-howto.txt
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/sh/new-machine.txt
+++ b/Documentation/sh/new-machine.txt
--- a/Documentation/sh/register-banks.txt
+++ b/Documentation/sh/register-banks.txt
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/Documentation/x86_64/kernel-stacks
+++ b/Documentation/x86_64/kernel-stacks
--- a/6
+++ b/6
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
--- a/arch/avr32/mm/tlb.c
+++ b/arch/avr32/mm/tlb.c
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
--- a/arch/i386/boot/edd.S
+++ b/arch/i386/boot/edd.S
--- a/arch/i386/boot/setup.S
+++ b/arch/i386/boot/setup.S
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.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/cpu.h
+++ b/arch/i386/kernel/cpu/cpu.h
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/i386/kernel/cpu/intel.c
--- a/arch/i386/kernel/cpu/mcheck/Makefile
+++ b/arch/i386/kernel/cpu/mcheck/Makefile
--- a/arch/i386/kernel/cpu/mcheck/p4.c
+++ b/arch/i386/kernel/cpu/mcheck/p4.c
--- a/arch/i386/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/i386/kernel/cpu/mcheck/therm_throt.c
--- a/arch/i386/kernel/cpu/nexgen.c
+++ b/arch/i386/kernel/cpu/nexgen.c
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/cpu/rise.c
+++ b/arch/i386/kernel/cpu/rise.c
--- a/arch/i386/kernel/cpu/transmeta.c
+++ b/arch/i386/kernel/cpu/transmeta.c
--- a/arch/i386/kernel/cpu/umc.c
+++ b/arch/i386/kernel/cpu/umc.c
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.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/i8259.c
+++ b/arch/i386/kernel/i8259.c
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
--- a/arch/i386/kernel/mca.c
+++ b/arch/i386/kernel/mca.c
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.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/relocate_kernel.S
+++ b/arch/i386/kernel/relocate_kernel.S
--- 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/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/srat.c
+++ b/arch/i386/kernel/srat.c
--- a/arch/i386/kernel/stacktrace.c
+++ b/arch/i386/kernel/stacktrace.c
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.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/tsc.c
+++ b/arch/i386/kernel/tsc.c
--- a/arch/i386/lib/Makefile
+++ b/arch/i386/lib/Makefile
--- a/arch/i386/lib/semaphore.S
+++ b/arch/i386/lib/semaphore.S
--- a/arch/i386/mach-generic/bigsmp.c
+++ b/arch/i386/mach-generic/bigsmp.c
--- a/arch/i386/mach-generic/es7000.c
+++ b/arch/i386/mach-generic/es7000.c
--- a/arch/i386/mach-generic/probe.c
+++ b/arch/i386/mach-generic/probe.c
--- a/arch/i386/mach-generic/summit.c
+++ b/arch/i386/mach-generic/summit.c
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
--- a/arch/i386/mm/extable.c
+++ b/arch/i386/mm/extable.c
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
--- a/arch/i386/mm/highmem.c
+++ b/arch/i386/mm/highmem.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/oprofile/nmi_timer_int.c
+++ b/arch/i386/oprofile/nmi_timer_int.c
--- a/arch/i386/oprofile/op_model_athlon.c
+++ b/arch/i386/oprofile/op_model_athlon.c
--- a/arch/i386/oprofile/op_model_p4.c
+++ b/arch/i386/oprofile/op_model_p4.c
--- a/arch/i386/oprofile/op_model_ppro.c
+++ b/arch/i386/oprofile/op_model_ppro.c
--- a/arch/i386/oprofile/op_x86_model.h
+++ b/arch/i386/oprofile/op_x86_model.h
--- 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/early.c
+++ b/arch/i386/pci/early.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/pci.h
+++ b/arch/i386/pci/pci.h
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/esi.c
+++ b/arch/ia64/kernel/esi.c
--- a/Show more
+++ b/Show more