diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2011-05-10 10:25:23 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-05-10 10:25:23 +0200 |
| commit | 604c307bf47350c74bb36507b86a08726c7c2075 (patch) | |
| tree | 74a04255ea9105c3b29e3e9dfcacf66db984c7ee /include/linux/debugobjects.h | |
| parent | arch/x86/kernel/pci-iommu_table.c: Convert sprintf_symbol to %pS (diff) | |
| parent | dma-debug: print information about leaked entry (diff) | |
| parent | x86/amd-iommu: Add ATS enable/disable code (diff) | |
| parent | x86/amd-iommu: Add support for invalidate_all command (diff) | |
Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and 'amd-iommu/extended-features' into iommu/2.6.40
Conflicts:
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c