Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/Kconfig
	arch/x86/Makefile
	arch/x86/kvm/Kconfig
	arch/x86/kvm/mmu.c
	arch/x86/kvm/paging_tmpl.h
	arch/x86/kvm/svm.c
	arch/x86/kvm/vmx.c
	arch/x86/kvm/vmx.h
	arch/x86/kvm/x86.c
	arch/x86/kvm/x86_emulate.c
	include/asm-x86/kvm_host.h
	include/linux/Kbuild
	include/linux/kvm_host.h
	virt/kvm/kvm_main.c

Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index dbf5fa716f86..a499f50e6676 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1267,7 +1267,7 @@ static int kvm_resume(struct sys_device *dev)
 }
 
 static struct sysdev_class kvm_sysdev_class = {
-	set_kset_name("kvm"),
+	.name = "kvm",
 	.suspend = kvm_suspend,
 	.resume = kvm_resume,
 };