]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2012 02:40:17 +0000 (19:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2012 02:40:17 +0000 (19:40 -0700)
commitc28c48516975af9cad219a52557333342e0ed319
tree80015a8cee2e413348391d0e9e19662fc0385170
parentdaae677f56187e83ddc81cf8e45bbcc236e0e661
parentea0dcf903e7d76aa5d483d876215fedcfdfe140f
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()