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

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

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