git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
899e3ee
fcd0861
e4efd94
0ed6d2d
94441c3
)
Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu...
author
Joerg Roedel
<joerg.roedel@amd.com>
Fri, 21 Oct 2011 12:38:55 +0000
(14:38 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Fri, 21 Oct 2011 12:38:55 +0000
(14:38 +0200)
Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/iommu.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff