| commit | 07bbc16a8676b06950a21f35b59f69b2fe763bbd | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Sep 23 23:26:42 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Sep 23 23:26:42 2008 +0200 |
| tree | f87fbfea747e9d92591c8d0a54db7c487e3c3d78 | |
| parent | 6a9e91846bf52cc70a0417de19fdfac224c435c4 [diff] | |
| parent | f8e256c687eb53850685747757c8d75e58756e15 [diff] |
Merge branch 'timers/urgent' into x86/xen Conflicts: arch/x86/kernel/process_32.c arch/x86/kernel/process_64.c Manual merge: arch/x86/kernel/smpboot.c Signed-off-by: Ingo Molnar <mingo@elte.hu>