From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2012 17:39:32 +0000 (-0700)
Subject: Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~2425
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ceee0e95b67401ea34118a54369496ecdfb9a199;p=firefly-linux-kernel-4.4.55.git

Merge branch 'core-iommu-for-linus' of git://git./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_*()
---

ceee0e95b67401ea34118a54369496ecdfb9a199