Skip to content
Commit 7a42c4ff authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36

parents b37fa16e 323f99cb 80a506b8
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