aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-09-03 16:34:23 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2009-09-03 16:34:23 +0200
commit03362a05c55122baff3556109c922285299dfec4 (patch)
tree85f83fbf4e1e8027eca05fbd8285041053a713c4 /mm
parent85da07c409daba3d067824f0051d58f70cb571a0 (diff)
parent4751a95134e05f1172131d2001c6991d671fa58c (diff)
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 'mm')
0 files changed, 0 insertions, 0 deletions