Merge branches 'timers/clockevents', 'timers/hpet', 'timers/hrtimers' and 'timers...
authorIngo Molnar <mingo@elte.hu>
Sun, 8 Feb 2009 19:14:11 +0000 (20:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 8 Feb 2009 19:14:11 +0000 (20:14 +0100)
1  2  3  4  5 
kernel/fork.c
kernel/sched.c

diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sched.c
Simple merge