summaryrefslogtreecommitdiffstats
path: root/module/zfs/dmu_tx.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-07-061-43/+136
|\
| * Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-021-43/+136
| |\
| | * Rebase master to b117Brian Behlendorf2009-07-021-43/+136
* | | Merge branch 'feature-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-191-1/+1
|\ \ \
| * | | Add extra () requested by gccBrian Behlendorf2009-03-191-1/+1
* | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-03-191-0/+43
|\| | |
| * | | Add 'feature-commit-cb' branch for DMU commit callbacks.Brian Behlendorf2009-03-191-0/+43
| | |/ | |/|
* | | Merge branch 'feature-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-181-61/+0
|\ \ \
| * | | Revert changes from this branch so the branch may be removed. WeBrian Behlendorf2008-12-181-61/+0
| * | | Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cbBrian Behlendorf2008-12-111-0/+61
| |/ /
* | / Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-111-0/+61
| |/ |/|
* | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-111-2/+2
|/
* Move the world out of /zfs/ and seperate out module build treeBrian Behlendorf2008-12-111-0/+1068