diff --git a/[refs] b/[refs]
index eea8c9cb5ed2..ff5ee9c08e55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d710cba3afde2109030254ee90654fbb580e8af
+refs/heads/master: c9daa2722a3f1967e3e9750fd4cb6a7352a3cd63
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index 2d0eeac7251f..944bbcdd2b8d 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -380,7 +380,7 @@ static int __init ppro_init(char ** cpu_type)
 
 	if (cpu_model == 14)
 		*cpu_type = "i386/core";
-	else if (cpu_model == 15)
+	else if (cpu_model == 15 || cpu_model == 23)
 		*cpu_type = "i386/core_2";
 	else if (cpu_model > 0xd)
 		return 0;
diff --git a/trunk/drivers/lguest/Kconfig b/trunk/drivers/lguest/Kconfig
index 7eb9ecff8f4a..002d4f4e93c6 100644
--- a/trunk/drivers/lguest/Kconfig
+++ b/trunk/drivers/lguest/Kconfig
@@ -2,6 +2,7 @@ config LGUEST
 	tristate "Linux hypervisor example code"
 	depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
 	select HVC_DRIVER
+	select LGUEST_GUEST
 	---help---
 	  This is a very simple module which allows you to run
 	  multiple instances of the same Linux kernel, using the
@@ -15,5 +16,4 @@ config LGUEST_GUEST
 	bool
 	help
 	  The guest needs code built-in, even if the host has lguest
-	  support as a module.  The drivers are tiny, so we build them
-	  in too.
+	  support as a module.