Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

2026-09-26 18:16:26 +00:00 · 2010-02-25 20:41:34 +00:00 · 2010-02-25 20:41:34 +00:00 · 2a2d10f386
commit 2a2d10f386
parent 2f68ffd11a c499546f43
364 changed files with 4256 additions and 1961 deletions
--- a/Documentation/ABI/testing/ima_policy
+++ b/Documentation/ABI/testing/ima_policy
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/15
+++ b/15
--- a/2
+++ b/2
--- a/arch/arm/configs/mv78xx0_defconfig
+++ b/arch/arm/configs/mv78xx0_defconfig
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/mach-gemini/gpio.c
+++ b/arch/arm/mach-gemini/gpio.c
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
--- a/arch/arm/mach-mv78xx0/Kconfig
+++ b/arch/arm/mach-mv78xx0/Kconfig
--- a/arch/arm/mach-mv78xx0/Makefile
+++ b/arch/arm/mach-mv78xx0/Makefile
--- a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
+++ b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
--- a/arch/arm/mach-mv78xx0/mpp.c
+++ b/arch/arm/mach-mv78xx0/mpp.c
--- a/arch/arm/mach-mv78xx0/mpp.h
+++ b/arch/arm/mach-mv78xx0/mpp.h
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
--- a/arch/ia64/include/asm/elf.h
+++ b/arch/ia64/include/asm/elf.h
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/mm/c-octeon.c
+++ b/arch/mips/mm/c-octeon.c
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
--- a/arch/powerpc/mm/tlb_hash64.c
+++ b/arch/powerpc/mm/tlb_hash64.c
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
--- 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/signal32.c
+++ b/arch/sparc/kernel/signal32.c
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
--- a/arch/x86/include/asm/system.h
+++ b/arch/x86/include/asm/system.h
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/mm/gup.c
+++ b/arch/x86/mm/gup.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
--- a/drivers/dma/ioat/dma_v2.c
+++ b/drivers/dma/ioat/dma_v2.c
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
--- a/Show more
+++ b/Show more