| commit | e4f807c2b4d81636fc63993368646c5bfd42b22f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Aug 25 10:54:07 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Aug 25 10:54:07 2008 +0200 |
| tree | 2ff100911b1ba4e26e3d9aad41edb9b48405f01e | |
| parent | 25258ef762bc4a05fa9c4523f7dae56e3fd01864 [diff] | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 [diff] |
Merge branch 'linus' into x86/xen Conflicts: arch/x86/kernel/paravirt.c Signed-off-by: Ingo Molnar <mingo@elte.hu>