]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 04:23:26 +0000 (15:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 04:23:26 +0000 (15:23 +1100)
commit06b6304e50d14cadef1a7d4fe728a330d03d23c8
tree820bb656e599563c529c1e94418d0aeadb185af9
parent2267ee881d3e0f70754bd314ca6db7a771051069
parent4afa9cb48aa743af4794a64a47e819ae3ad822b2
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/iommu/Makefile
21 files changed:
Documentation/kernel-parameters.txt
arch/arm/common/gic.c
arch/arm/kernel/smp.c
arch/arm/kernel/traps.c
arch/arm/mach-footbridge/netwinder-hw.c
arch/arm/mach-integrator/core.c
arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/context.c
arch/ia64/configs/generic_defconfig
arch/x86/Kconfig
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/process_32.c
drivers/acpi/processor_idle.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/iommu/Kconfig
drivers/iommu/Makefile
drivers/iommu/intel-iommu.c
drivers/leds/Kconfig
kernel/sched.c