git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c1eee67
2e8b569
736501e
47bccd6
)
Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and...
author
Joerg Roedel
<joerg.roedel@amd.com>
Thu, 28 May 2009 16:23:56 +0000
(18:23 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Thu, 28 May 2009 16:23:56 +0000
(18:23 +0200)
Conflicts:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff