git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
28a33cb
2c9195e
2c0ae17
7d43c2e
8ce44a2
3177bb7
)
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr...
author
Joerg Roedel
<joerg.roedel@amd.com>
Mon, 23 Jul 2012 10:17:00 +0000
(12:17 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Mon, 23 Jul 2012 10:17:00 +0000
(12:17 +0200)
Conflicts:
drivers/iommu/iommu.c
include/linux/iommu.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff