Merge branches 'amd/transparent-bridge' and 'core'
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 21 Jun 2011 09:14:10 +0000 (11:14 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 21 Jun 2011 09:14:10 +0000 (11:14 +0200)
commit801019d59d4e1d1523e5897949fd3b6843571bd0
tree398a934d23eb28d3e555d5938c8abe52152fcd2f
parent56299378726d5f2ba8d3c8cbbd13cb280ba45e4f
parent71f77580906b60eb43daff0efb99792e76a3d06d
parent403f81d8ee532c976d50a5e1051f14ec78ae8db3
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>
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu_types.h