git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85da07c 4751a95)
Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32
authorJoerg Roedel <joerg.roedel@amd.com>
Thu, 3 Sep 2009 14:34:23 +0000 (16:34 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Thu, 3 Sep 2009 14:34:23 +0000 (16:34 +0200)
Conflicts:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c


Trivial merge
Pandora Kernel Repository