diff options
| author | 2008-08-14 10:55:26 +0200 | |
|---|---|---|
| committer | 2008-08-14 10:55:26 +0200 | |
| commit | d4439087d316613548c70472291bf4ca646ce24b (patch) | |
| tree | 4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4 /scripts/basic | |
| parent | x86: fix xsave build error (diff) | |
| parent | Linux 2.6.27-rc3 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts/basic')
0 files changed, 0 insertions, 0 deletions
