Merge branch 'linus' into x86/memtest

diff --cc arch/x86/Kconfig
index 2d7dc41,e0edaaa..d69c102
--- 1/arch/x86/Kconfig
--- 2/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