]> 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, 5 Oct 2011 05:47:16 +0000 (16:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 06:18:33 +0000 (17:18 +1100)
commitf480d73577e7a402d20747f832943cf077418ba1
tree170d99c4d68dba7fb7f3ae8024d2ae49622d689e
parent373f693af6c6c042ddf7fb759c7ebf7de1dfb48c
parent7a279530293637690bbd6d87fcb605069f3cb697
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/iommu/Makefile
20 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
drivers/acpi/processor_idle.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/iommu/Kconfig
drivers/iommu/Makefile
drivers/iommu/intel-iommu.c
drivers/leds/Kconfig
include/linux/llist.h
kernel/sched.c