| commit | 51ca3c679194e7435c25b8e77b0a73c597e41ae9 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Aug 14 14:58:01 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Aug 14 14:58:01 2008 +0200 |
| tree | a681dca369607ab0f371d5246b0f75140b860a8a | |
| parent | b55793f7528ce1b73c25b3ac8a86a6cda2a0f9a4 [diff] | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 [diff] |
Merge branch 'linus' into x86/core Conflicts: arch/x86/kernel/genapic_64.c include/asm-x86/kvm_host.h Signed-off-by: Ingo Molnar <mingo@elte.hu>