Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-24 18:16:04 +00:00 · 2008-04-28 04:01:34 +00:00 · 2008-04-28 04:01:34 +00:00 · 1dbbb60774
commit 1dbbb60774
parent d09e860cf0 064922a805
487 changed files with 36143 additions and 13605 deletions
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
--- a/Documentation/ia64/kvm.txt
+++ b/Documentation/ia64/kvm.txt
--- a/Documentation/ide/ide-tape.txt
+++ b/Documentation/ide/ide-tape.txt
--- a/Documentation/ide/ide.txt
+++ b/Documentation/ide/ide.txt
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/mips/AU1xxx_IDE.README
+++ b/Documentation/mips/AU1xxx_IDE.README
--- a/Documentation/powerpc/kvm_440.txt
+++ b/Documentation/powerpc/kvm_440.txt
--- a/Documentation/s390/kvm.txt
+++ b/Documentation/s390/kvm.txt
--- a/Documentation/smart-config.txt
+++ b/Documentation/smart-config.txt
--- a/17
+++ b/17
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
--- a/arch/ia64/kvm/asm-offsets.c
+++ b/arch/ia64/kvm/asm-offsets.c
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
--- a/arch/ia64/kvm/kvm_fw.c
+++ b/arch/ia64/kvm/kvm_fw.c
--- a/arch/ia64/kvm/kvm_minstate.h
+++ b/arch/ia64/kvm/kvm_minstate.h
--- a/arch/ia64/kvm/lapic.h
+++ b/arch/ia64/kvm/lapic.h
--- a/arch/ia64/kvm/misc.h
+++ b/arch/ia64/kvm/misc.h
--- a/arch/ia64/kvm/mmio.c
+++ b/arch/ia64/kvm/mmio.c
--- a/arch/ia64/kvm/optvfault.S
+++ b/arch/ia64/kvm/optvfault.S
--- a/arch/ia64/kvm/process.c
+++ b/arch/ia64/kvm/process.c
--- a/arch/ia64/kvm/trampoline.S
+++ b/arch/ia64/kvm/trampoline.S
--- a/arch/ia64/kvm/vcpu.c
+++ b/arch/ia64/kvm/vcpu.c
--- a/arch/ia64/kvm/vcpu.h
+++ b/arch/ia64/kvm/vcpu.h
--- a/arch/ia64/kvm/vmm.c
+++ b/arch/ia64/kvm/vmm.c
--- a/arch/ia64/kvm/vmm_ivt.S
+++ b/arch/ia64/kvm/vmm_ivt.S
--- a/arch/ia64/kvm/vti.h
+++ b/arch/ia64/kvm/vti.h
--- a/arch/ia64/kvm/vtlb.c
+++ b/arch/ia64/kvm/vtlb.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
--- a/arch/powerpc/kvm/44x_tlb.h
+++ b/arch/powerpc/kvm/44x_tlb.h
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
--- a/arch/powerpc/kvm/booke_guest.c
+++ b/arch/powerpc/kvm/booke_guest.c
--- a/arch/powerpc/kvm/booke_host.c
+++ b/arch/powerpc/kvm/booke_host.c
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
--- a/arch/s390/kvm/Makefile
+++ b/arch/s390/kvm/Makefile
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
--- a/arch/s390/kvm/gaccess.h
+++ b/arch/s390/kvm/gaccess.h
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.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/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
--- a/arch/s390/kvm/sie64a.S
+++ b/arch/s390/kvm/sie64a.S
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
--- a/arch/x86/kernel/cpu/nexgen.c
+++ b/arch/x86/kernel/cpu/nexgen.c
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
--- a/arch/x86/kernel/kdebugfs.c
+++ b/arch/x86/kernel/kdebugfs.c
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
--- a/arch/x86/kernel/mfgpt_32.c
+++ b/arch/x86/kernel/mfgpt_32.c
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
--- a/Show more
+++ b/Show more