git.maquefel.me Git - linux.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	83cce2b69eaa4bc7535f98f75b79397baf277470
tree	538c3e7c6d587ce6f57ca65bb2cd4e805fbfc312	tree \| snapshot
parent	c1eee67b2d8464781f5868a34168df61e40e85a6	commit \| diff
parent	2e8b569614b89c9b1b85cba37db36daeeeff744e	commit \| diff
parent	736501ee000757082a4f0832826ae1eda7ea106e	commit \| diff
parent	47bccd6bb2b866449d3ecf2ba350ac1c7473b2b8	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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

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