From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Sep 2012 17:37:04 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v3.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~15934
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a3e3dbee62a8fcf13c349b141b3cedf35a65c41;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'iommu-fixes-v3.6-rc7' of git://git./linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
 "Two small patches:

	* One patch to fix the function declarations for
	  !CONFIG_IOMMU_API. This is causing build errors
	  in linux-next and should be fixed for v3.6.

	* Another patch to fix an IOMMU group related NULL pointer
	  dereference."

* tag 'iommu-fixes-v3.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix wrong assumption in iommu-group specific code
  iommu: static inline iommu group stub functions
---

6a3e3dbee62a8fcf13c349b141b3cedf35a65c41