tree 1fe3be14cc773f4df5606a9993930cc43889a169
parent 14131f2f98ac350ee9e73faed916d2238a8b6a0d
parent 83ce400928680a6c8123d492684b27857f5a2d95
author Ingo Molnar <mingo@elte.hu> 1235679719 +0100
committer Ingo Molnar <mingo@elte.hu> 1235679719 +0100

Merge branch 'sched/clock' into tracing/ftrace

Conflicts:
	kernel/sched_clock.c