]> granicus.if.org Git - zfs/commitdiff
projects / zfs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 374e693 b453b61)
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 11 Dec 2008 19:26:37 +0000 (11:26 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 11 Dec 2008 19:26:37 +0000 (11:26 -0800)
1  2 
lib/libzpool/kernel.c patch | diff1 | diff2 | blob | history
module/zfs/gzip.c patch | diff1 | diff2 | blob | history

diff --cc lib/libzpool/kernel.c
Simple merge
diff --cc module/zfs/gzip.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.