diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-25 10:45:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-25 10:47:00 +0200 |
commit | 704daf55c7297e727021063cb5d8ba1c55b84426 (patch) | |
tree | 15e7b49c69f1ba742ec5fb3a009e51e1564d6a75 /arch/x86/kvm/kvm_timer.h | |
parent | b0c6fbe458183cc7e1cab17be6efcbe7e435bad3 (diff) | |
parent | 123f3e1d76952759c0fc8b4fec55a3fc8084d56f (diff) |
Merge branch 'x86/asm' into x86/urgent
Merge reason: The linker script cleanups are ready for upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kvm/kvm_timer.h')
0 files changed, 0 insertions, 0 deletions