| commit | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 09:34:07 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 09:34:07 2009 +0100 |
| tree | 7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63 | |
| parent | 4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6 [diff] | |
| parent | 071a0bc2ceace31266836801510879407a3701fa [diff] |
Merge branch 'linus' into perfcounters/core Conflicts: arch/x86/kernel/acpi/boot.c