| commit | 0e2f65ee30eee2db054f7fd73f462c5da33ec963 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jul 25 11:37:07 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jul 25 11:37:07 2008 +0200 |
| tree | 26c61eb7745da0c0d9135e9d12088f570cb8530d | |
| parent | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb [diff] | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 [diff] |
Merge branch 'linus' into x86/pebs Conflicts: arch/x86/Kconfig.cpu arch/x86/kernel/cpu/intel.c arch/x86/kernel/setup_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>