tree 398a934d23eb28d3e555d5938c8abe52152fcd2f
parent 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f
parent 71f77580906b60eb43daff0efb99792e76a3d06d
parent 403f81d8ee532c976d50a5e1051f14ec78ae8db3
author Joerg Roedel <joerg.roedel@amd.com> 1308647650 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1308647650 +0200

Merge branches 'amd/transparent-bridge' and 'core'

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

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>