diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 16:34:23 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-03 16:34:23 +0200 |
| commit | 03362a05c55122baff3556109c922285299dfec4 (patch) | |
| tree | 85f83fbf4e1e8027eca05fbd8285041053a713c4 /arch/x86/kernel/cpu/proc.c | |
| parent | Merge branches 'gart/fixes', 'amd-iommu/fixes+cleanups' and 'amd-iommu/fault-handling' into amd-iommu/2.6.32 (diff) | |
| parent | x86/amd-iommu: Initialize passthrough mode when requested (diff) | |
| download | wireguard-linux-03362a05c55122baff3556109c922285299dfec4.tar.xz wireguard-linux-03362a05c55122baff3556109c922285299dfec4.zip | |
Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32
Conflicts:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
Diffstat (limited to 'arch/x86/kernel/cpu/proc.c')
0 files changed, 0 insertions, 0 deletions