]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
Merge branch 'use-mmap'
authorLucas De Marchi <lucas.demarchi@profusion.mobi>
Mon, 12 Dec 2011 12:30:01 +0000 (10:30 -0200)
committerLucas De Marchi <lucas.demarchi@profusion.mobi>
Mon, 12 Dec 2011 12:30:01 +0000 (10:30 -0200)
Conflicts:
libkmod/libkmod.c


Trivial merge