git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5629937
71f7758
403f81d
)
Merge branches 'amd/transparent-bridge' and 'core'
author
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 21 Jun 2011 09:14:10 +0000
(11:14 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 21 Jun 2011 09:14:10 +0000
(11:14 +0200)
Conflicts:
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff