Skip to content
GitLab
Explore
Sign in
Commit
b67ad2f7
authored
Nov 02, 2015
by
Joerg Roedel
Browse files
Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next
Conflicts: drivers/iommu/amd_iommu_types.h
parents
6a13feb9
b61e5e80
3ca9299e
166bdbd2
8128f23c
1228236d
393c092a
Changes
27
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