summaryrefslogtreecommitdiffstats
path: root/module/zfs/dmu_objset.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gcc-unused' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-091-3/+3
|\
| * Revert to original debugging code and wrap any variabled used onlyBrian Behlendorf2009-07-091-3/+3
| * Merge commit 'refs/top-bases/gcc-unused' into gcc-unusedBrian Behlendorf2009-07-021-47/+260
| |\
* | \ 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 commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesisBrian Behlendorf2009-07-021-47/+260
| |\ \ \ | | | |/ | | |/|
| * | | Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesisBrian Behlendorf2009-02-181-0/+33
| |\ \ \
| * | | | Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesisBrian Behlendorf2008-12-111-3/+3
* | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-021-47/+260
|\ \ \ \ \
| * \ \ \ \ Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-07-021-47/+260
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Rebase master to b117Brian Behlendorf2009-07-021-47/+260
| | | |/ / | | |/| |
* | | | | Merge branch 'gcc-unused' into refs/top-bases/gcc-branchBrian Behlendorf2009-03-111-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Resolve upstream unused variables so we can remove the -Wno-unusedBrian Behlendorf2009-03-111-1/+1
| | |/ / | |/| |
* | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-02-181-0/+33
|\ \ \ \ | | |/ / | |/| |
| * | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-02-181-0/+33
| |\| |
| | * | Rebase master to b108Brian Behlendorf2009-02-181-0/+33
| | |/
* | | Merge branch 'gcc-shadow' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-181-3/+3
|\ \ \
| * | | Resolve stat conflict with stat()Brian Behlendorf2008-12-181-3/+3
| | |/ | |/|
* | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-181-1/+3
|\ \ \ | | |/ | |/|
| * | Move int out of for construct for c90 complianceBrian Behlendorf2008-12-181-1/+3
| |/
* / Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-111-3/+3
|/
* Move the world out of /zfs/ and seperate out module build treeBrian Behlendorf2008-12-111-0/+1228