Merge branch 'linux-2.6' into next

2026-09-24 18:16:04 +00:00 · 2008-11-19 16:10:32 +11:00 · 2008-11-19 16:10:32 +11:00 · cea555d384
commit cea555d384
parent 78608dd32c 7f0f598a00
407 changed files with 17420 additions and 8017 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/filesystems/xip.txt
+++ b/Documentation/filesystems/xip.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/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/w1/masters/omap-hdq
+++ b/Documentation/w1/masters/omap-hdq
--- a/18
+++ b/18
--- a/2
+++ b/2
--- 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/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/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/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
--- a/arch/sh/include/asm/pgtable.h
+++ b/arch/sh/include/asm/pgtable.h
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
--- a/arch/sh/lib/copy_page.S
+++ b/arch/sh/lib/copy_page.S
--- a/arch/sh/mm/Makefile_32
+++ b/arch/sh/mm/Makefile_32
--- a/arch/sh/mm/Makefile_64
+++ b/arch/sh/mm/Makefile_64
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
--- a/arch/sh/mm/mmap.c
+++ b/arch/sh/mm/mmap.c
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
--- a/arch/sparc/include/asm/termbits.h
+++ b/arch/sparc/include/asm/termbits.h
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
--- a/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
--- a/Show more
+++ b/Show more