Merge branch 'linus' into x86/core

diff --cc arch/x86/include/asm/msr-index.h
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
index b09d4eb52bb95f89d8ba0f65968006fa5564ee67,1a89a2b68d1539a92939e4d33747a1bcd916390c..7437fa133c02dfdde137ca7201fb9734888a85bc
--- 1/arch/x86/kernel/cpu/intel.c
--- 2/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@@ -54,14 -54,12 +55,17 @@@ static void __cpuinit early_init_intel(
                c->x86_cache_alignment = 128;
  #endif
  
 +      /* CPUID workaround for 0F33/0F34 CPU */
 +      if (c->x86 == 0xF && c->x86_model == 0x3
 +          && (c->x86_mask == 0x3 || c->x86_mask == 0x4))
 +              c->x86_phys_bits = 36;
 +
        /*
         * c->x86_power is 8000_0007 edx. Bit 8 is TSC runs at constant rate
-        * with P/T states and does not stop in deep C-states
+        * with P/T states and does not stop in deep C-states.
+        *
+        * It is also reliable across cores and sockets. (but not across
+        * cabinets - we turn it off in that case explicitly.)
         */
        if (c->x86_power & (1 << 8)) {
                set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

diff --cc arch/x86/kernel/quirks.c
Simple merge

diff --cc drivers/pci/intr_remapping.c
Simple merge

diff --cc kernel/sched.c
Simple merge