git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
759643c
e6bc593
f8ffcc9
500c25e
2e12bc2
44229b1
)
Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd',...
author
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 2 Oct 2012 12:40:03 +0000
(14:40 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 2 Oct 2012 12:40:03 +0000
(14:40 +0200)
Conflicts:
drivers/iommu/amd_iommu_init.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff