Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2012 00:10:38 +0000 (17:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2012 00:10:38 +0000 (17:10 -0700)
commitb7f077d7bc28649f6bd369fadec01219e725a9c6
tree4e8f0959a8e522452ff8117c232f277b14e7bf07
parentb0e37d7ac6ba937c3776ff5111ff6a7fa832fb4f
parent1b198bb04ad72669d4bd6575fc9945ed595bfee0
Merge branch 'core-iommu-for-linus' of git://git./linux/kernel/git/tip/tip

Pull core/iommu changes for v3.4 from Ingo Molnar

* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/iommu/intel: Increase the number of iommus supported to MAX_IO_APICS
  x86/iommu/intel: Fix identity mapping for sandy bridge