summaryrefslogtreecommitdiffstats
path: root/module/zfs/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-02-186-17/+38
|\
| * Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-02-186-17/+38
| |\
| | * Rebase master to b108Brian Behlendorf2009-02-186-17/+38
* | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-1510-31/+68
|\| |
| * | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-1510-31/+68
| |\|
| | * Rebase master to b105Brian Behlendorf2009-01-1510-31/+68
* | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-131-3/+0
|\ \ \
| * | | List cleanup and use of list_node_init initializerBrian Behlendorf2009-01-131-3/+0
| | |/ | |/|
* | | Merge branch 'feature-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-185-48/+0
|\ \ \
| * \ \ Merge branch 'feature-commit-cb' into refs/top-bases/feature-branchBrian Behlendorf2008-12-185-48/+0
| |\ \ \
| | * | | Revert changes from this branch so the branch may be removed. WeBrian Behlendorf2008-12-185-48/+0
| * | | | Merge branch 'feature-commit-cb' into refs/top-bases/feature-branchBrian Behlendorf2008-12-112-0/+6
| |/ / /
| * / / Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cbBrian Behlendorf2008-12-115-0/+48
| |/ /
* | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-171-2/+2
|\ \ \ | | |/ | |/|
| * | Fix two prototypes in the right placeBrian Behlendorf2008-12-171-2/+2
* | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-171-2/+2
|\| |
| * | Fix prototypeBrian Behlendorf2008-12-171-2/+2
| * | Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototypeBrian Behlendorf2008-12-112-3/+3
| |/
* | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-117-0/+54
* | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-112-3/+3
|/
* Move the world out of /zfs/ and seperate out module build treeBrian Behlendorf2008-12-1152-0/+8662
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 05:52:26 +0000