git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b882b8f 5f82682)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 02:57:23 +0000 (12:57 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 02:57:23 +0000 (12:57 +1000)
commit	b5e64fd7f35d84370424e1c261e7a123019f3155
tree	7dddadc8e655070b29a374580d76c9d57ea3ed66	tree \| snapshot
parent	b882b8f66d762c18c79d3d189a5131aa1561a979	commit \| diff
parent	5f82682743eb133926dda2c87130376a996af99f	commit \| diff

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/iommu/Makefile

18 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/common/gic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-footbridge/netwinder-hw.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/common-pci.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/cache-l2x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/context.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/configs/generic_defconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_ondemand.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iommu/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules