diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-15 02:27:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-15 02:27:52 +0200 |
commit | 45e38cff4fce8d6871b5fa5e734e4dc9814d6056 (patch) | |
tree | 4b926c3ca494c2f17ba15a46173ff869457a06d9 /net/l2tp/l2tp_ppp.c | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
parent | KVM: x86: Use adjustment in guest cycles when handling MSR_IA32_TSC_ADJUST (diff) | |
download | linux-45e38cff4fce8d6871b5fa5e734e4dc9814d6056.tar.xz linux-45e38cff4fce8d6871b5fa5e734e4dc9814d6056.zip |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"Just two very small & simple patches"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: Use adjustment in guest cycles when handling MSR_IA32_TSC_ADJUST
KVM: x86: zero IDT limit on entry to SMM
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
0 files changed, 0 insertions, 0 deletions