Merge branches 'iommu/api' and 'iommu/amd' into for-linus
authorJoerg Roedel <joerg.roedel@amd.com>
Sat, 3 Jan 2009 15:43:44 +0000 (16:43 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Sat, 3 Jan 2009 15:43:44 +0000 (16:43 +0100)
1  2 
arch/x86/Kconfig

Simple merge