commit 6a3e3dbee62a8fcf13c349b141b3cedf35a65c41
author Linus Torvalds <torvalds@linux-foundation.org> Sat Sep 29 10:37:04 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Sep 29 10:37:04 2012 -0700
tree feb306790403c1eb203a310c83a6175fc0ba1189
parent 21e98932dcf15fe7eabd09a35f2020e0dd86b685
parent 0774e392555a128cff7a94929b9ce957927fef49

Merge tag 'iommu-fixes-v3.6-rc7' of git://git.kernel.org/pub/scm/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