tree 74a04255ea9105c3b29e3e9dfcacf66db984c7ee
parent e969687595c27e02e02be0c9363261826123ba77
parent ba4b87ad5497cba555954885db99c99627f93748
parent fd7b5535e10ce820f030842da3f289f80ec0d4f3
parent 58fc7f1419560efa9c426b829c195050e0147d7f
author Joerg Roedel <joerg.roedel@amd.com> 1305015923 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1305015923 +0200

Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and 'amd-iommu/extended-features' into iommu/2.6.40

Conflicts:
	arch/x86/include/asm/amd_iommu_types.h
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c