| commit | 0d5959723e1db3fd7323c198a50c16cecf96c7a9 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Jun 11 23:31:52 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Jun 11 23:31:52 2009 +0200 |
| tree | 802b623fff261ebcbbddadf84af5524398364a18 | |
| parent | 62fdac5913f71f8f200bd2c9bd59a02e9a1498e9 [diff] | |
| parent | 512626a04e72aca60effe111fa0333ed0b195d21 [diff] |
Merge branch 'linus' into x86/mce3 Conflicts: arch/x86/kernel/cpu/mcheck/mce_64.c arch/x86/kernel/irq.c Merge reason: Resolve the conflicts above. Signed-off-by: Ingo Molnar <mingo@elte.hu>