diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 15:21:59 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-27 02:35:19 -0500 |
| commit | 1b49061d400c9e51e3ac2aac026a099fe599b9bb (patch) | |
| tree | 54c632cd7f0be2573897c1463a247e69fb769940 /arch/ia64/kvm/kvm-ia64.c | |
| parent | 14131f2f98ac350ee9e73faed916d2238a8b6a0d (diff) | |
| parent | 83ce400928680a6c8123d492684b27857f5a2d95 (diff) | |
Merge branch 'sched/clock' into tracing/ftrace
Conflicts:
kernel/sched_clock.c
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
0 files changed, 0 insertions, 0 deletions