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: ab11a9b 77852fe)

author	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:35 +0000 (08:45 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:35 +0000 (08:45 +0100)
commit	8c281e678b3c2b0ec2fed207fd94d596ebc4c9be
tree	5c00bf13604b21756297664a521f245a522c3e3f	tree \| snapshot
parent	ab11a9bc806bf33b280a065a575ec7808682640e	commit \| diff
parent	77852fea6e2442a0e654a9292060489895de18c7	commit \| diff

manual merge of sched/core

Signed-off-by: Ingo Molnar <mingo@kernel.org>

13 files changed:

arch/powerpc/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/time.c	diff1 \|	diff2 \|	blob \| history
include/linux/hardirq.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/context_tracking.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/rt.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules