git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
805a6af
1a36ea8
1456e9d
)
Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next
author
Joerg Roedel
<joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:04:05 +0000
(13:04 +0100)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:04:05 +0000
(13:04 +0100)
Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff