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: 7ae2f97 5f82682)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Oct 2011 04:51:43 +0000 (15:51 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Oct 2011 04:51:43 +0000 (15:51 +1100)
commit	a42b09b12304f7b71b17a12e440b3712fb24eae7
tree	6a54fea0c0f40050bd590277a7eac7a224615a34	tree \| snapshot
parent	7ae2f976b80f23804a12ed4cd8656ce438b189ec	commit \| diff
parent	5f82682743eb133926dda2c87130376a996af99f	commit \| diff

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

Conflicts:
drivers/iommu/Makefile

19 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/iommu/intel-iommu.c	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