* [PATCH] qemu-kvm: Remove merge artifact
@ 2011-02-17 14:30 Jan Kiszka
0 siblings, 0 replies; only message in thread
From: Jan Kiszka @ 2011-02-17 14:30 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti; +Cc: kvm
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
kvm-stub.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kvm-stub.c b/kvm-stub.c
index caef9b4..fc2b810 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -137,7 +137,6 @@ int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign)
return -ENOSYS;
}
-<<<<<<< HEAD
int kvm_has_gsi_routing(void)
{
return 0;
--
1.7.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-17 14:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17 14:30 [PATCH] qemu-kvm: Remove merge artifact Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox