summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-09-03 17:14:57 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2009-09-03 17:14:57 +0200
commit2b681fafcc50fea6304ed418667c9d04282acb73 (patch)
treea950c2b32b7cb2e31bd1eb32a72d4983fd553e1e /lib
parent03362a05c55122baff3556109c922285299dfec4 (diff)
parentabdc5eb3d69279039ba6cb89719913d08013ab14 (diff)
Merge branch 'amd-iommu/pagetable' into amd-iommu/2.6.32
Conflicts: arch/x86/kernel/amd_iommu.c
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions