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)
commitb0a11f44aba631fd4b898b620c93cc2096f3f15c
tree71b8965d88d53ddeca2def77e2d74dc1af9fca52
parent7398ca79d227f7cd7f2ce23f08624e30081dcb4e
parent0e93dd883537e628b809a2120854cd591c8935f1
Merge branches 'iommu/api' and 'iommu/amd' into for-linus
arch/x86/Kconfig