]> err.no Git - linux-2.6/commitdiff
Merge branch 'sched/clock' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 10:19:13 +0000 (12:19 +0200)
1  2 
include/linux/sched.h
kernel/sched_clock.c

Simple merge
Simple merge