| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 12:35:23 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 12:37:32 2008 +0200 |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 [diff] | |
| parent | fd048088306656824958e7783ffcee27e241b361 [diff] |
Merge branch 'linus' into x86/xen Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/process_64.c arch/x86/xen/enlighten.c