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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2e4ebb1 2ce5883)

author	Ingo Molnar <mingo@kernel.org>
	Tue, 30 Oct 2012 07:15:40 +0000 (08:15 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 30 Oct 2012 07:15:40 +0000 (08:15 +0100)
commit	e8ab4021f3167a60efd09af1f722057a3d6e9929
tree	b7475cbc5ce88bfdd88f54741781b8ffdd40c6ca	tree \| snapshot
parent	2e4ebb15bef8d33f33160f3297f44f1918651f01	commit \| diff
parent	2ce58833efe45e21f23b617aaf01710ef91cd017	commit \| diff

Merge branch 'numa/core'

Conflicts:
kernel/sched/fair.c

include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/debug.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/features.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules