Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment