git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9821626
6bfb09a
)
Merge branch 'linus' into x86/iommu
author
Ingo Molnar
<mingo@elte.hu>
Sun, 14 Sep 2008 12:07:00 +0000
(14:07 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 14 Sep 2008 12:07:00 +0000
(14:07 +0200)
Conflicts:
lib/swiotlb.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge