Merge branch 'sched/clock' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 20:21:59 +0000 (21:21 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 20:21:59 +0000 (21:21 +0100)
Conflicts:
kernel/sched_clock.c


Trivial merge