diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-11-09 15:19:43 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-11-09 15:20:31 +0100 |
| commit | 6314a17fec5cab4784a5cbb75e816b15e3d22e3e (patch) | |
| tree | 3af05ba8d007f82e58491e3431095913ba3d7645 /net/core/link_watch.c | |
| parent | ad3610919e6f6a4d815c5bf163556b950d6aea56 (diff) | |
| parent | 871b7ef2a1850d0b435c8b324bf4a5d391adde3f (diff) | |
| download | linux-6314a17fec5cab4784a5cbb75e816b15e3d22e3e.tar.bz2 | |
Merge tag 'tags/for-kvmgt' into HEAD
The three KVM patches that KVMGT needs.
Conflicts:
arch/x86/include/asm/kvm_page_track.h
arch/x86/kvm/mmu.c
Diffstat (limited to 'net/core/link_watch.c')
0 files changed, 0 insertions, 0 deletions