From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 25 Jun 2008 10:31:14 +0000 (+0200)
Subject: Merge branch 'linus' into x86/memtest
X-Git-Tag: v2.6.27-rc1~1106^2~251^17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=607baf1f4ef94637ab0f7d0e258932851dc5c0a2;p=linux-2.6

Merge branch 'linus' into x86/memtest
---

607baf1f4ef94637ab0f7d0e258932851dc5c0a2
diff --cc arch/x86/Kconfig
index 2d7dc41077,e0edaaa692..d69c102786
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -410,10 -411,14 +411,14 @@@ config PARAVIR
  	  over full virtualization.  However, when run without a hypervisor
  	  the kernel is theoretically slower and slightly larger.
  
+ config PARAVIRT_CLOCK
+ 	bool
+ 	default n
+ 
  endif
  
 -config MEMTEST_BOOTPARAM
 -	bool "Memtest boot parameter"
 +config MEMTEST
 +	bool "Memtest"
  	depends on X86_64
  	default y
  	help