From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Apr 2012 02:40:17 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.4-rc5~16
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c28c48516975af9cad219a52557333342e0ed319;p=~andy%2Flinux

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Use x2apic physical mode based on FADT setting
  x86/mrst: Quiet sparse noise about plain integer as NULL pointer
  x86, intel_cacheinfo: Fix error return code in amd_set_l3_disable_slot()
---

c28c48516975af9cad219a52557333342e0ed319