Merge commit 'v3.1' into spi/next

2026-10-16 22:39:48 +00:00 · 2011-10-24 13:42:08 +02:00 · 2011-10-24 13:42:08 +02:00 · a853ba8d6d
commit a853ba8d6d
parent 5bdb761341 c3b92c8787
556 changed files with 4729 additions and 3592 deletions
--- a/Documentation/ABI/testing/sysfs-class-scsi_host
+++ b/Documentation/ABI/testing/sysfs-class-scsi_host
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/scaling.txt
+++ b/Documentation/networking/scaling.txt
--- a/Documentation/vm/transhuge.txt
+++ b/Documentation/vm/transhuge.txt
--- a/32
+++ b/32
--- a/2
+++ b/2
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
--- a/arch/arm/include/asm/localtimer.h
+++ b/arch/arm/include/asm/localtimer.h
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
--- a/arch/arm/kernel/smp_scu.c
+++ b/arch/arm/kernel/smp_scu.c
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
--- a/arch/arm/mach-exynos4/mct.c
+++ b/arch/arm/mach-exynos4/mct.c
--- a/arch/arm/mach-exynos4/platsmp.c
+++ b/arch/arm/mach-exynos4/platsmp.c
--- a/arch/arm/mach-exynos4/setup-keypad.c
+++ b/arch/arm/mach-exynos4/setup-keypad.c
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
--- a/arch/arm/mach-s3c2412/s3c2412.c
+++ b/arch/arm/mach-s3c2412/s3c2412.c
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
--- a/arch/arm/mach-s3c2443/clock.c
+++ b/arch/arm/mach-s3c2443/clock.c
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
--- a/arch/arm/mach-tegra/cpu-tegra.c
+++ b/arch/arm/mach-tegra/cpu-tegra.c
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/plat-s5p/irq-gpioint.c
+++ b/arch/arm/plat-s5p/irq-gpioint.c
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
--- a/arch/arm/plat-samsung/include/plat/watchdog-reset.h
+++ b/arch/arm/plat-samsung/include/plat/watchdog-reset.h
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
--- a/arch/mips/alchemy/common/power.c
+++ b/arch/mips/alchemy/common/power.c
--- a/arch/mips/alchemy/devboards/bcsr.c
+++ b/arch/mips/alchemy/devboards/bcsr.c
--- a/arch/mips/alchemy/devboards/db1200/setup.c
+++ b/arch/mips/alchemy/devboards/db1200/setup.c
--- a/arch/mips/ar7/irq.c
+++ b/arch/mips/ar7/irq.c
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
--- a/arch/mips/cobalt/irq.c
+++ b/arch/mips/cobalt/irq.c
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
--- a/arch/mips/emma/markeins/irq.c
+++ b/arch/mips/emma/markeins/irq.c
--- a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
--- a/arch/mips/include/asm/mach-powertv/dma-coherence.h
+++ b/arch/mips/include/asm/mach-powertv/dma-coherence.h
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
--- a/arch/mips/jz4740/gpio.c
+++ b/arch/mips/jz4740/gpio.c
--- a/arch/mips/kernel/ftrace.c
+++ b/arch/mips/kernel/ftrace.c
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
--- a/arch/mips/lantiq/xway/ebu.c
+++ b/arch/mips/lantiq/xway/ebu.c
--- a/arch/mips/lantiq/xway/pmu.c
+++ b/arch/mips/lantiq/xway/pmu.c
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
--- a/arch/mips/loongson/fuloong-2e/irq.c
+++ b/arch/mips/loongson/fuloong-2e/irq.c
--- a/arch/mips/loongson/lemote-2f/irq.c
+++ b/arch/mips/loongson/lemote-2f/irq.c
--- a/arch/mips/mm/mmap.c
+++ b/arch/mips/mm/mmap.c
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
--- a/arch/mips/netlogic/xlr/Makefile
+++ b/arch/mips/netlogic/xlr/Makefile
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
--- a/arch/mips/pci/pci-rc32434.c
+++ b/arch/mips/pci/pci-rc32434.c
--- a/arch/mips/pmc-sierra/msp71xx/msp_irq.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq.c
--- a/arch/mips/pnx8550/common/int.c
+++ b/arch/mips/pnx8550/common/int.c
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
--- 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/sparc/include/asm/pgtsrmmu.h
+++ b/arch/sparc/include/asm/pgtsrmmu.h
--- a/arch/sparc/include/asm/spitfire.h
+++ b/arch/sparc/include/asm/spitfire.h
--- a/arch/sparc/include/asm/xor_64.h
+++ b/arch/sparc/include/asm/xor_64.h
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
--- a/arch/sparc/kernel/cpumap.c
+++ b/arch/sparc/kernel/cpumap.c
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
--- a/Show more
+++ b/Show more