Merge branch 'annotations' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeg...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)
commit8c61af9ebc016180507b246c875217e188be6eca
tree100d3b95b97c442f8da218eddf9843823928e78d
parent70bcd708dfd1de453905212c9c5c755b1844772b
parent7e988b103d0d52190244517edc76e649071284bb
Merge branch 'annotations' of git://git./linux/kernel/git/borntraeger/linux into kvm-master
virt/kvm/eventfd.c
virt/kvm/kvm_main.c