| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Feb 11 09:22:04 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Feb 11 09:22:04 2009 +0100 |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 [diff] | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 [diff] |
Merge commit 'v2.6.29-rc4' into perfcounters/core Conflicts: arch/x86/kernel/setup_percpu.c arch/x86/mm/fault.c drivers/acpi/processor_idle.c kernel/irq/handle.c