| commit | 2b681fafcc50fea6304ed418667c9d04282acb73 | [log] [tgz] |
|---|---|---|
| author | Joerg Roedel <joerg.roedel@amd.com> | Thu Sep 03 17:14:57 2009 +0200 |
| committer | Joerg Roedel <joerg.roedel@amd.com> | Thu Sep 03 17:14:57 2009 +0200 |
| tree | a950c2b32b7cb2e31bd1eb32a72d4983fd553e1e | |
| parent | 03362a05c55122baff3556109c922285299dfec4 [diff] | |
| parent | abdc5eb3d69279039ba6cb89719913d08013ab14 [diff] |
Merge branch 'amd-iommu/pagetable' into amd-iommu/2.6.32 Conflicts: arch/x86/kernel/amd_iommu.c