]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
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)
commit5d0859cef29167d45dc6cf89d19712145e6005d6
tree1fe3be14cc773f4df5606a9993930cc43889a169
parent14131f2f98ac350ee9e73faed916d2238a8b6a0d
parent83ce400928680a6c8123d492684b27857f5a2d95
Merge branch 'sched/clock' into tracing/ftrace

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