Skip to content
Snippets Groups Projects
Commit 801019d5 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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: default avatarJoerg Roedel <joerg.roedel@amd.com>
parents 56299378 71f77580 403f81d8
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 304 additions and 259 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment