x86/detect-hyper change for v3.1

Linus,

Please pull the latest x86-detect-hyper-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-detect-hyper-for-linus

Thanks,

Ingo

------------------>
Anupam Chanda (1):
x86, hyper: Change hypervisor detection order

 arch/x86/kernel/cpu/hypervisor.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 8095f86..755f64f 100644
@@ -32,11 +32,11 @@
  */
 static const __initconst struct hypervisor_x86 * const hypervisors[] =
 {
-	&x86_hyper_vmware,
-	&x86_hyper_ms_hyperv,
 #ifdef CONFIG_XEN_PVHVM
 	&x86_hyper_xen_hvm,
 #endif
+	&x86_hyper_vmware,
+	&x86_hyper_ms_hyperv,
 };
 
 const struct hypervisor_x86 *x86_hyper;