bf423229f92
parent e9071b0be5e7ce4903b7f7c370769d485774d3e3
author Linus Torvalds <torvalds@linux-foundation.org> 1342978772 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1342978772 -0700

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

Pull core/iommu changes from Ingo Molnar.

* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  iommu/dmar: Use pr_format() instead of PREFIX to tidy up pr_*() calls
  iommu/dmar: Reserve mmio space used by the IOMMU, if the BIOS forgets to
  iommu/dmar: Replace printks with appropriate pr_*()