| commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Oct 13 11:05:51 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Oct 13 11:05:51 2008 +0200 |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee | |
| parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 [diff] | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b [diff] |
Merge branch 'linus' into oprofile-v2 Conflicts: arch/x86/kernel/apic_32.c arch/x86/oprofile/nmi_int.c include/linux/pci_ids.h