| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 09:44:22 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 09:44:22 2009 +0100 |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f [diff] | |
| parent | 071a0bc2ceace31266836801510879407a3701fa [diff] |
Merge branch 'linus' into x86/apic Conflicts: arch/x86/kernel/acpi/boot.c arch/x86/mm/fault.c