git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
00fb543
95bdaf7
)
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
author
Joerg Roedel
<joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:06:28 +0000
(13:06 +0100)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:06:28 +0000
(13:06 +0100)
Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
include/linux/iommu.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff