Merge branch 'linus' into x86/urgent

2026-09-24 18:16:04 +00:00 · 2008-07-26 11:26:19 +02:00 · 2008-07-26 11:26:19 +02:00 · 88bef5a407
commit 88bef5a407
parent 054a3fd824 024e8ac044
1298 changed files with 34343 additions and 37699 deletions
--- a/8
+++ b/8
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
--- a/Documentation/ABI/testing/sysfs-kernel-mm
+++ b/Documentation/ABI/testing/sysfs-kernel-mm
--- a/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
+++ b/Documentation/ABI/testing/sysfs-kernel-mm-hugepages
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
--- a/Documentation/DocBook/procfs-guide.tmpl
+++ b/Documentation/DocBook/procfs-guide.tmpl
--- a/Documentation/accounting/delay-accounting.txt
+++ b/Documentation/accounting/delay-accounting.txt
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
--- a/Documentation/accounting/taskstats-struct.txt
+++ b/Documentation/accounting/taskstats-struct.txt
--- a/Documentation/bt8xxgpio.txt
+++ b/Documentation/bt8xxgpio.txt
--- a/Documentation/controllers/memory.txt
+++ b/Documentation/controllers/memory.txt
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
--- a/Documentation/fb/sh7760fb.txt
+++ b/Documentation/fb/sh7760fb.txt
--- a/Documentation/fb/tridentfb.txt
+++ b/Documentation/fb/tridentfb.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
--- a/Documentation/moxa-smartio
+++ b/Documentation/moxa-smartio
--- a/Documentation/power/00-INDEX
+++ b/Documentation/power/00-INDEX
--- a/Documentation/power/apm-acpi.txt
+++ b/Documentation/power/apm-acpi.txt
--- a/Documentation/power/pm.txt
+++ b/Documentation/power/pm.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/unaligned-memory-access.txt
+++ b/Documentation/unaligned-memory-access.txt
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
--- a/19
+++ b/19
--- a/1
+++ b/1
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/boot/misc.c
+++ b/arch/alpha/boot/misc.c
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/kernel/kprobes.c
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/mach-iop32x/n2100.c
+++ b/arch/arm/mach-iop32x/n2100.c
--- a/arch/arm/mach-ns9xxx/clock.c
+++ b/arch/arm/mach-ns9xxx/clock.c
--- a/arch/arm/mm/discontig.c
+++ b/arch/arm/mm/discontig.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
--- a/arch/avr32/kernel/stacktrace.c
+++ b/arch/avr32/kernel/stacktrace.c
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
--- a/arch/avr32/mm/ioremap.c
+++ b/arch/avr32/mm/ioremap.c
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
--- a/arch/cris/arch-v10/boot/compressed/misc.c
+++ b/arch/cris/arch-v10/boot/compressed/misc.c
--- a/arch/cris/arch-v10/mm/init.c
+++ b/arch/cris/arch-v10/mm/init.c
--- a/arch/cris/arch-v32/boot/compressed/misc.c
+++ b/arch/cris/arch-v32/boot/compressed/misc.c
--- a/arch/cris/arch-v32/mm/init.c
+++ b/arch/cris/arch-v32/mm/init.c
--- a/arch/cris/kernel/profile.c
+++ b/arch/cris/kernel/profile.c
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
--- a/arch/h8300/boot/compressed/misc.c
+++ b/arch/h8300/boot/compressed/misc.c
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
--- a/arch/ia64/kernel/sys_ia64.c
+++ b/arch/ia64/kernel/sys_ia64.c
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
--- a/arch/m32r/boot/compressed/misc.c
+++ b/arch/m32r/boot/compressed/misc.c
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
--- a/arch/m68knommu/configs/m5208evb_defconfig
+++ b/arch/m68knommu/configs/m5208evb_defconfig
--- a/arch/m68knommu/configs/m5249evb_defconfig
+++ b/arch/m68knommu/configs/m5249evb_defconfig
--- a/arch/m68knommu/configs/m5275evb_defconfig
+++ b/arch/m68knommu/configs/m5275evb_defconfig
--- a/arch/m68knommu/configs/m5307c3_defconfig
+++ b/arch/m68knommu/configs/m5307c3_defconfig
--- a/arch/m68knommu/configs/m5407c3_defconfig
+++ b/arch/m68knommu/configs/m5407c3_defconfig
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
--- a/arch/m68knommu/platform/coldfire/Makefile
+++ b/arch/m68knommu/platform/coldfire/Makefile
--- a/arch/m68knommu/platform/coldfire/dma_timer.c
+++ b/arch/m68knommu/platform/coldfire/dma_timer.c
--- a/arch/m68knommu/platform/coldfire/head.S
+++ b/arch/m68knommu/platform/coldfire/head.S
--- a/arch/m68knommu/platform/coldfire/pit.c
+++ b/arch/m68knommu/platform/coldfire/pit.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
--- a/arch/mips/kernel/stacktrace.c
+++ b/arch/mips/kernel/stacktrace.c
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
--- a/arch/mips/sgi-ip27/ip27-klnuma.c
+++ b/arch/mips/sgi-ip27/ip27-klnuma.c
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
--- a/Show more
+++ b/Show more