diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
commit | 52e31f89cc40c613b22e62108fe12b27433a888e (patch) | |
tree | c3cd45d6950706c32efdd341715e70b6ee6d7a5e /arch/x86/kvm/ioapic.h | |
parent | x86/asm/entry: Make thunk's restore a local label (diff) | |
parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
download | linux-52e31f89cc40c613b22e62108fe12b27433a888e.tar.xz linux-52e31f89cc40c613b22e62108fe12b27433a888e.zip |
Merge branch 'linus' into x86/asm, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/ioapic.h')
0 files changed, 0 insertions, 0 deletions