git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Joerg Roedel <joerg.roedel@amd.com>
	Tue, 10 May 2011 08:25:23 +0000 (10:25 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Tue, 10 May 2011 08:25:23 +0000 (10:25 +0200)
commit	604c307bf47350c74bb36507b86a08726c7c2075
tree	74a04255ea9105c3b29e3e9dfcacf66db984c7ee	tree \| snapshot
parent	e969687595c27e02e02be0c9363261826123ba77	commit \| diff
parent	ba4b87ad5497cba555954885db99c99627f93748	commit \| diff
parent	fd7b5535e10ce820f030842da3f289f80ec0d4f3	commit \| diff
parent	58fc7f1419560efa9c426b829c195050e0147d7f	commit \| diff

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

arch/x86/include/asm/amd_iommu_types.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/amd_iommu_init.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/pci/intel-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history