git.baikalelectronics.ru Git - kernel.git/commit

author	Joerg Roedel <joerg.roedel@amd.com>
	Thu, 28 May 2009 16:23:56 +0000 (18:23 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Thu, 28 May 2009 16:23:56 +0000 (18:23 +0200)
commit	8cfb24700aaf954093d9ab7355466ee4a1ea0636
tree	538c3e7c6d587ce6f57ca65bb2cd4e805fbfc312	tree \| snapshot
parent	1a82bb569319312e69ea5e129034b4039fdea96d	commit \| diff
parent	82d2532a96dc7acb34ea147381ab094d3cbbb216	commit \| diff
parent	1be1f2d0f31d9a4af1747f84b19ca4196e5fe4dc	commit \| diff
parent	c5895e573258038e01e43f348af326986a1a763d	commit \| diff

Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and 'amd-iommu/extended-allocator' into amd-iommu/2.6.31

Conflicts:
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