Merge branch 'ep93xx/board' into next/board

2026-10-16 22:39:48 +00:00 · 2011-10-17 11:22:50 +00:00 · 2011-10-17 11:22:50 +00:00 · 8eb41582d2
commit 8eb41582d2
parent 127d4eb97b 1cb17e2dbd
424 changed files with 4124 additions and 2954 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/24
+++ b/24
--- 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/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
--- 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-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.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-s3c2443/clock.c
+++ b/arch/arm/mach-s3c2443/clock.c
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
--- 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/plat-s5p/irq-gpioint.c
+++ b/arch/arm/plat-s5p/irq-gpioint.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/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/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
--- a/arch/um/Kconfig.x86
+++ b/arch/um/Kconfig.x86
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
--- a/arch/um/include/asm/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
--- a/arch/um/include/shared/line.h
+++ b/arch/um/include/shared/line.h
--- a/arch/um/include/shared/registers.h
+++ b/arch/um/include/shared/registers.h
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
--- a/arch/um/os-Linux/registers.c
+++ b/arch/um/os-Linux/registers.c
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
--- a/arch/um/sys-i386/asm/ptrace.h
+++ b/arch/um/sys-i386/asm/ptrace.h
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
--- a/arch/um/sys-i386/shared/sysdep/ptrace.h
+++ b/arch/um/sys-i386/shared/sysdep/ptrace.h
--- a/arch/um/sys-x86_64/ptrace.c
+++ b/arch/um/sys-x86_64/ptrace.c
--- a/arch/um/sys-x86_64/shared/sysdep/ptrace.h
+++ b/arch/um/sys-x86_64/shared/sysdep/ptrace.h
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
--- a/drivers/bluetooth/btwilink.c
+++ b/drivers/bluetooth/btwilink.c
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
--- a/Show more
+++ b/Show more