Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Nov 2013 02:15:12 +0000 (11:15 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Nov 2013 02:15:12 +0000 (11:15 +0900)
commit339a4b72c83dc7d8b29f43f7417add791e201ad3
tree7e1cf20b82fbe42ed96b246a86e0cccadb3912de
parentdba538ff5610ee126e33a28fe713b3f108d31f2c
parentced3c42c9fcba049ec9c76c8461ac194cafb20ba
Merge branch 'x86-iommu-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 iommu changes from Ingo Molnar:
 "Make it easier to turn off the old AMD GART code"

* 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/iommu: Clean up the CONFIG_GART_IOMMU config option a bit
  x86/iommu: Don't make AMD_GART depend on EXPERT and default y
arch/x86/Kconfig