Merge branch 'sched/clock' into sched/devel

author Ingo Molnar <[email protected]>

Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)

committer Ingo Molnar <[email protected]>

Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)
author Ingo Molnar <[email protected]>
Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)
committer Ingo Molnar <[email protected]>
Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched_clock.c
Simple merge
author	Ingo Molnar <[email protected]>
	Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)
committer	Ingo Molnar <[email protected]>
	Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched_clock.c	patch \|	diff1 \|	diff2 \|	blob \| history