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: c8121af b432b5a)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Sep 2011 04:27:03 +0000 (14:27 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Sep 2011 04:27:03 +0000 (14:27 +1000)
commit	7c7272ec5dc5d8822255083045bf70becc664e1c
tree	052e22a3b9e7cdedbbad700ae9465ef98df4881a	tree \| snapshot
parent	c8121af1bb17a9fee9c074c2dba7171c99c918d4	commit \| diff
parent	b432b5a0d40d7a60fc38d37ef703282b1eaccca9	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