summaryrefslogtreecommitdiffstats
path: root/cmd/zfs/zfs_main.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gcc-cast' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-171-1/+1
|\
| * Fix NULL should be 0 usageBrian Behlendorf2008-12-171-1/+1
| * Merge commit 'refs/top-bases/gcc-cast' into gcc-castBrian Behlendorf2008-12-111-6/+6
* | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-111-6/+6
* | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2008-12-111-1/+1
|/
* Move the world out of /zfs/ and seperate out module build treeBrian Behlendorf2008-12-111-0/+4229