git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa4d066
e09f8ea
)
Merge branch 'core' into x86/vt-d
author
Joerg Roedel
<jroedel@suse.de>
Wed, 23 Jul 2014 14:04:37 +0000
(16:04 +0200)
committer
Joerg Roedel
<jroedel@suse.de>
Wed, 23 Jul 2014 14:04:37 +0000
(16:04 +0200)
Conflicts:
drivers/iommu/intel-iommu.c
Trivial merge