Skip to content
GitLab
Explore
Sign in
Commit
7f65ef01
authored
Apr 02, 2015
by
Joerg Roedel
Browse files
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next
Conflicts: drivers/iommu/amd_iommu.c drivers/iommu/tegra-gart.c drivers/iommu/tegra-smmu.c
parents
509fca89
2f119c78
d4b03664
b61e2e62
804cb54c
89be34a1
Changes
146
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment