summaryrefslogtreecommitdiffstats
path: root/module/zfs/dsl_prop.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-08-181-1/+1
|\
| * Rebase master to b121Brian Behlendorf2009-08-181-1/+1
* | Merge branch 'gcc-unused' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-091-1/+1
|\ \
| * | Revert to original debugging code and wrap any variabled used onlyBrian Behlendorf2009-07-091-1/+1
| * | Merge commit 'refs/top-bases/gcc-unused' into gcc-unusedBrian Behlendorf2009-07-021-6/+81
| |\|
| * | Merge commit 'refs/top-bases/gcc-unused' into gcc-unusedBrian Behlendorf2008-12-111-1/+1
* | | Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-1/+1
|\ \ \
| * | | Add missing paranthesis for gcc.Brian Behlendorf2009-07-071-1/+1
| | |/ | |/|
* | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-021-6/+81
|\| |
| * | Rebase master to b117Brian Behlendorf2009-07-021-6/+81
| |/
* | Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branchBrian Behlendorf2009-03-111-1/+1
|\ \
| * | Added 'gcc-ident-pragmas' branch.Ricardo M. Correia2009-03-111-1/+1
| |/
* / Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-111-1/+1
|/
* Move the world out of /zfs/ and seperate out module build treeBrian Behlendorf2008-12-111-0/+602