git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e969687
ba4b87a
fd7b553
58fc7f1
)
Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and...
author
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 10 May 2011 08:25:23 +0000
(10:25 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 10 May 2011 08:25:23 +0000
(10:25 +0200)
Conflicts:
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff