diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-12-14 12:41:31 +0100 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-12-14 12:52:09 +0100 |
| commit | a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00 (patch) | |
| tree | f94f71b5a542b42ecea60e6f903e3f19e5b2eada /Documentation/filesystems/btrfs.txt | |
| parent | iommu/amd: Add invalid_ppr callback (diff) | |
| parent | iommu/core: remove the temporary pgsize settings (diff) | |
| download | linux-a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00.tar.xz linux-a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00.zip | |
Merge branch 'iommu/page-sizes' into x86/amd
Conflicts:
drivers/iommu/amd_iommu.c
Diffstat (limited to 'Documentation/filesystems/btrfs.txt')
0 files changed, 0 insertions, 0 deletions