Merge branch 'annotations' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeg...

author Paolo Bonzini <pbonzini@redhat.com>

Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)

committer Paolo Bonzini <pbonzini@redhat.com>

Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)
author Paolo Bonzini <pbonzini@redhat.com>
Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)
committer Paolo Bonzini <pbonzini@redhat.com>
Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)
diff --cc virt/kvm/eventfd.c
Simple merge
diff --cc virt/kvm/kvm_main.c
Simple merge
author	Paolo Bonzini <pbonzini@redhat.com>
	Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Mon, 10 Jul 2017 12:44:24 +0000 (14:44 +0200)
		1	2
virt/kvm/eventfd.c	patch \|	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	patch \|	diff1 \|	diff2 \|	blob \| history