]> granicus.if.org Git - zfs/commitdiff
projects / zfs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6b541d 45d1cae)
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:08:52 +0000 (12:08 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:08:52 +0000 (12:08 -0700)
1  2 
cmd/zdb/zdb.c patch | diff1 | diff2 | blob | history
cmd/ztest/ztest.c patch | diff1 | diff2 | blob | history

diff --cc cmd/zdb/zdb.c
Simple merge
diff --cc cmd/ztest/ztest.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.