| commit | 92e2d508464b6293ad274fb606f766a458894142 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Feb 10 00:41:02 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Feb 10 00:41:02 2009 +0100 |
| tree | 39bf383364530e5cdeacb205d32d69a4b78e253d | |
| parent | 5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1 [diff] | |
| parent | d315760ffa261c15ff92699ac6f514112543d7ca [diff] |
Merge branch 'x86/urgent' into core/percpu Conflicts: arch/x86/kernel/acpi/boot.c