pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 81444a7 d65bd5e)

author	Ingo Molnar <mingo@elte.hu>
	Fri, 12 Dec 2008 12:48:57 +0000 (13:48 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 12 Dec 2008 12:48:57 +0000 (13:48 +0100)
commit	45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df
tree	4d51c73533c386aee16fde1e74b5e3bc22eedc53	tree \| snapshot
parent	81444a799550214f549caf579cf65a0ca55e70b7	commit \| diff
parent	d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c	commit \| diff

Merge branch 'sched/core' into cpus4096

Conflicts:
include/linux/ftrace.h
kernel/sched.c

include/linux/ftrace.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/posix-cpu-timers.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_rt.c	diff1 \|	diff2 \|	blob \| history
kernel/softlockup.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.