Merge branch 'linus' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 11:47:28 +0000 (12:47 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 11:47:28 +0000 (12:47 +0100)
commit7df4edb07cf54a4868b9a750424c0d2aa68f8d66
tree0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f
parent0d688da5505d77bcef2441e0a22d8cc26459702d
parent559595a985e106d2fa9f0c79b7f5805453fed593
Merge branch 'linus' into core/iommu
arch/ia64/hp/common/sba_iommu.c
arch/x86/include/asm/dma-mapping.h
arch/x86/kernel/pci-gart_64.c
drivers/pci/intel-iommu.c
include/linux/intel-iommu.h