diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 13:04:05 +0100 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 13:04:05 +0100 |
| commit | 00fb5430f547e411ab03385cfa548776aaac1c92 (patch) | |
| tree | f2c543e9c9ce4b1400081de08bcaf6fd55b72972 /drivers/pci | |
| parent | Linux 3.2 (diff) | |
| parent | iommu/omap: be verbose when omap_iommu_iova_to_phys fails (diff) | |
| parent | iommu/amd: Set IOTLB invalidation timeout (diff) | |
| download | linux-00fb5430f547e411ab03385cfa548776aaac1c92.tar.xz linux-00fb5430f547e411ab03385cfa548776aaac1c92.zip | |
Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next
Conflicts:
drivers/pci/hotplug/acpiphp_glue.c