diff --git a/[refs] b/[refs]
index cc39253f202b..aea4e9e17f08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edf884172e9828c6234b254208af04655855038d
+refs/heads/master: 0fce5623ba248d3af0d7fb719d5ac367cc9d5192
diff --git a/trunk/arch/x86/kvm/Makefile b/trunk/arch/x86/kvm/Makefile
index 880ffe403b35..af41534af496 100644
--- a/trunk/arch/x86/kvm/Makefile
+++ b/trunk/arch/x86/kvm/Makefile
@@ -2,9 +2,9 @@
 # Makefile for Kernel-based Virtual Machine module
 #
 
-common-objs = $(addprefix ../../../drivers/kvm/, kvm_main.o)
+common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
 
-EXTRA_CFLAGS += -I drivers/kvm
+EXTRA_CFLAGS += -I virt/kvm
 
 kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
 	ioapic.o
diff --git a/trunk/drivers/kvm/iodev.h b/trunk/virt/kvm/iodev.h
similarity index 100%
rename from trunk/drivers/kvm/iodev.h
rename to trunk/virt/kvm/iodev.h
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
similarity index 100%
rename from trunk/drivers/kvm/kvm_main.c
rename to trunk/virt/kvm/kvm_main.c