projects
/
platform
/
upstream
/
kmod.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1e7e48
cb8d4d3
)
Merge branch 'use-mmap'
author
Lucas De Marchi
<lucas.demarchi@profusion.mobi>
Mon, 12 Dec 2011 12:30:01 +0000
(10:30 -0200)
committer
Lucas De Marchi
<lucas.demarchi@profusion.mobi>
Mon, 12 Dec 2011 12:30:01 +0000
(10:30 -0200)
Conflicts:
libkmod/libkmod.c
Trivial merge