From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Mar 2012 15:26:25 +0000 (-0800)
Subject: Merge tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.3-rc7~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0cacaf51a0b3092fc84e5c8d483721baee67b60f;p=~emulex%2Finfiniband.git

Merge tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull two IOMMU fixes from Joerg Roedel:
 "The first is an additional fix for the OMAP initialization order issue
  and the second patch fixes a possible section mismatch which can lead
  to a kernel crash in the AMD IOMMU driver when suspend/resume is used
  and the compiler has not inlined the iommu_set_device_table function."

* tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  x86/amd: iommu_set_device_table() must not be __init
  ARM: OMAP: fix iommu, not mailbox
---

0cacaf51a0b3092fc84e5c8d483721baee67b60f