Merge branch 'linus' into sched/core

Conflicts: kernel/Makefile
2026-09-22 18:22:42 +00:00 · 2008-11-19 09:44:37 +01:00 · 2008-11-19 09:44:37 +01:00 · 3ac3ba0b39
commit 3ac3ba0b39
parent 934352f214 7f0f598a00
651 changed files with 25387 additions and 11994 deletions
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/testing/sysfs-c2port
+++ b/Documentation/ABI/testing/sysfs-c2port
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
--- a/Documentation/PCI/00-INDEX
+++ b/Documentation/PCI/00-INDEX
--- a/Documentation/PCI/MSI-HOWTO.txt
+++ b/Documentation/PCI/MSI-HOWTO.txt
--- a/Documentation/acpi/debug.txt
+++ b/Documentation/acpi/debug.txt
--- a/Documentation/blockdev/00-INDEX
+++ b/Documentation/blockdev/00-INDEX
--- a/Documentation/blockdev/README.DAC960
+++ b/Documentation/blockdev/README.DAC960
--- a/Documentation/blockdev/cciss.txt
+++ b/Documentation/blockdev/cciss.txt
--- a/Documentation/blockdev/cpqarray.txt
+++ b/Documentation/blockdev/cpqarray.txt
--- a/Documentation/blockdev/floppy.txt
+++ b/Documentation/blockdev/floppy.txt
--- a/Documentation/blockdev/nbd.txt
+++ b/Documentation/blockdev/nbd.txt
--- a/Documentation/blockdev/paride.txt
+++ b/Documentation/blockdev/paride.txt
--- a/Documentation/blockdev/ramdisk.txt
+++ b/Documentation/blockdev/ramdisk.txt
--- a/Documentation/c2port.txt
+++ b/Documentation/c2port.txt
--- a/Documentation/cgroups/freezer-subsystem.txt
+++ b/Documentation/cgroups/freezer-subsystem.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/xip.txt
+++ b/Documentation/filesystems/xip.txt
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
--- a/Documentation/hwmon/adt7462
+++ b/Documentation/hwmon/adt7462
--- a/Documentation/hwmon/lis3lv02d
+++ b/Documentation/hwmon/lis3lv02d
--- a/Documentation/ics932s401
+++ b/Documentation/ics932s401
--- a/Documentation/ioctl/00-INDEX
+++ b/Documentation/ioctl/00-INDEX
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
--- a/Documentation/serial/00-INDEX
+++ b/Documentation/serial/00-INDEX
--- a/Documentation/serial/README.cycladesZ
+++ b/Documentation/serial/README.cycladesZ
--- a/Documentation/serial/computone.txt
+++ b/Documentation/serial/computone.txt
--- a/Documentation/serial/digiepca.txt
+++ b/Documentation/serial/digiepca.txt
--- a/Documentation/serial/hayes-esp.txt
+++ b/Documentation/serial/hayes-esp.txt
--- a/Documentation/serial/moxa-smartio
+++ b/Documentation/serial/moxa-smartio
--- a/Documentation/serial/riscom8.txt
+++ b/Documentation/serial/riscom8.txt
--- a/Documentation/serial/rocket.txt
+++ b/Documentation/serial/rocket.txt
--- a/Documentation/serial/specialix.txt
+++ b/Documentation/serial/specialix.txt
--- a/Documentation/serial/stallion.txt
+++ b/Documentation/serial/stallion.txt
--- a/Documentation/serial/sx.txt
+++ b/Documentation/serial/sx.txt
--- a/Documentation/serial/tty.txt
+++ b/Documentation/serial/tty.txt
--- a/Documentation/video4linux/README.cx88
+++ b/Documentation/video4linux/README.cx88
--- a/Documentation/video4linux/si470x.txt
+++ b/Documentation/video4linux/si470x.txt
--- a/Documentation/w1/masters/omap-hdq
+++ b/Documentation/w1/masters/omap-hdq
--- a/49
+++ b/49
--- a/2
+++ b/2
--- a/arch/Kconfig
+++ b/arch/Kconfig
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
--- a/arch/arm/include/asm/hardware/iop3xx-adma.h
+++ b/arch/arm/include/asm/hardware/iop3xx-adma.h
--- a/arch/arm/include/asm/hardware/iop_adma.h
+++ b/arch/arm/include/asm/hardware/iop_adma.h
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
--- a/arch/arm/mach-clps7500/include/mach/hardware.h
+++ b/arch/arm/mach-clps7500/include/mach/hardware.h
--- a/arch/arm/mach-h720x/include/mach/boards.h
+++ b/arch/arm/mach-h720x/include/mach/boards.h
--- a/arch/arm/mach-integrator/include/mach/platform.h
+++ b/arch/arm/mach-integrator/include/mach/platform.h
--- a/arch/arm/mach-iop13xx/include/mach/adma.h
+++ b/arch/arm/mach-iop13xx/include/mach/adma.h
--- a/arch/arm/mach-realview/clock.c
+++ b/arch/arm/mach-realview/clock.c
--- a/arch/arm/mach-realview/include/mach/platform.h
+++ b/arch/arm/mach-realview/include/mach/platform.h
--- a/arch/arm/mach-versatile/clock.c
+++ b/arch/arm/mach-versatile/clock.c
--- a/arch/arm/mach-versatile/include/mach/platform.h
+++ b/arch/arm/mach-versatile/include/mach/platform.h
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
--- a/arch/arm/plat-iop/setup.c
+++ b/arch/arm/plat-iop/setup.c
--- a/arch/blackfin/include/asm/bfin-global.h
+++ b/arch/blackfin/include/asm/bfin-global.h
--- a/arch/blackfin/include/asm/dma-mapping.h
+++ b/arch/blackfin/include/asm/dma-mapping.h
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
--- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
--- a/arch/blackfin/mach-common/cache.S
+++ b/arch/blackfin/mach-common/cache.S
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/arch/blackfin/mach-common/cpufreq.c
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
--- a/arch/ia64/include/asm/machvec.h
+++ b/arch/ia64/include/asm/machvec.h
--- a/arch/ia64/include/asm/meminit.h
+++ b/arch/ia64/include/asm/meminit.h
--- a/arch/ia64/include/asm/sal.h
+++ b/arch/ia64/include/asm/sal.h
--- a/arch/ia64/include/asm/sn/sn_sal.h
+++ b/arch/ia64/include/asm/sn/sn_sal.h
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
--- a/arch/ia64/kvm/vcpu.h
+++ b/arch/ia64/kvm/vcpu.h
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
--- a/arch/ia64/uv/kernel/setup.c
+++ b/arch/ia64/uv/kernel/setup.c
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
--- a/arch/mn10300/Kconfig.debug
+++ b/arch/mn10300/Kconfig.debug
--- a/arch/mn10300/mm/misalignment.c
+++ b/arch/mn10300/mm/misalignment.c
--- a/arch/parisc/include/asm/smp.h
+++ b/arch/parisc/include/asm/smp.h
--- a/arch/powerpc/boot/dts/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/gef_sbc610.dts
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
--- a/Show more
+++ b/Show more