git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 175d614 6c274d1)
Merge branch 'iommu/page-sizes' into x86/amd
authorJoerg Roedel <joerg.roedel@amd.com>
Wed, 14 Dec 2011 11:41:31 +0000 (12:41 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Wed, 14 Dec 2011 11:52:09 +0000 (12:52 +0100)
Conflicts:
drivers/iommu/amd_iommu.c


Trivial merge
Pandora Kernel Repository