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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 03:55:11 +0000 (14:55 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 03:55:11 +0000 (14:55 +1100)
commit	97239208e52a6dd274bc7cab49befeefc4fdbdf3
tree	b9899338abab9a7c4583185931009da999ca02f5	tree \| snapshot
parent	c3912d977d7c03277d96a38556e8ad0235edc183	commit \| diff
parent	3624ee9205d145017e511149b367a0c1dd88b683	commit \| diff

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

Conflicts:
arch/arm/mm/init.c
arch/powerpc/include/asm/cputime.h

27 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/cputime.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/idle.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/machine_kexec.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/tlb_nohash.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_ondemand.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/cputime.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/idle.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/machine_kexec.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/tlb_nohash.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_ondemand.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history