Merge branch 'linus' into x86/gart

2026-09-24 18:16:04 +00:00 · 2008-06-16 11:27:18 +02:00 · 2008-06-16 11:27:18 +02:00 · 33ee375b2e
commit 33ee375b2e
parent 6703f6d10d 066519068a
258 changed files with 2737 additions and 1901 deletions
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
--- a/Documentation/filesystems/sysfs-pci.txt
+++ b/Documentation/filesystems/sysfs-pci.txt
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
--- a/38
+++ b/38
--- a/4
+++ b/4
--- a/arch/arm/mach-pxa/ssp.c
+++ b/arch/arm/mach-pxa/ssp.c
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kvm/mmio.c
+++ b/arch/ia64/kvm/mmio.c
--- a/arch/m68knommu/platform/coldfire/timers.c
+++ b/arch/m68knommu/platform/coldfire/timers.c
--- a/arch/parisc/hpux/gate.S
+++ b/arch/parisc/hpux/gate.S
--- a/arch/parisc/hpux/wrappers.S
+++ b/arch/parisc/hpux/wrappers.S
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
--- a/arch/parisc/kernel/perf_asm.S
+++ b/arch/parisc/kernel/perf_asm.S
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
--- a/arch/parisc/kernel/signal32.c
+++ b/arch/parisc/kernel/signal32.c
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
--- a/arch/parisc/lib/lusercopy.S
+++ b/arch/parisc/lib/lusercopy.S
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
--- a/arch/powerpc/kvm/booke_guest.c
+++ b/arch/powerpc/kvm/booke_guest.c
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
--- a/arch/x86/boot/a20.c
+++ b/arch/x86/boot/a20.c
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
--- a/arch/x86/kernel/mfgpt_32.c
+++ b/arch/x86/kernel/mfgpt_32.c
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
--- a/block/blktrace.c
+++ b/block/blktrace.c
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.c
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/atm/eni.h
+++ b/drivers/atm/eni.h
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
--- a/drivers/char/generic_nvram.c
+++ b/drivers/char/generic_nvram.c
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
--- a/Show more
+++ b/Show more