tree 80015a8cee2e413348391d0e9e19662fc0385170
parent daae677f56187e83ddc81cf8e45bbcc236e0e661
parent ea0dcf903e7d76aa5d483d876215fedcfdfe140f
author Linus Torvalds <torvalds@linux-foundation.org> 1335580817 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1335580817 -0700

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()