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 /drivers/gpu/drm/radeon/radeon_drv.c | |
| parent | 175d6146738b3d04e1adcaa4a971a3b2b0dbd8af (diff) | |
| parent | 6c274d1cd5b3aa0834e9f0c3f58038f42278ff8c (diff) | |
| download | blackbird-op-linux-a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00.tar.gz blackbird-op-linux-a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00.zip | |
Merge branch 'iommu/page-sizes' into x86/amd
Conflicts:
drivers/iommu/amd_iommu.c
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.c')
0 files changed, 0 insertions, 0 deletions
