summaryrefslogtreecommitdiffstats
path: root/module/zfs
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-02-181-2/+3
|\
| * Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-02-181-2/+3
| |\
| | * Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-02-181-2/+3
| | |\
| | | * C90 fixes int declared in for() is a C99 constructBrian Behlendorf2009-02-181-2/+3
| | | * Local try should be in this patchBrian Behlendorf2009-02-181-0/+1
* | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-02-181-9/+9
|\| | |
| * | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-02-181-9/+9
| |\| |
| | * | Merge branch 'gcc-cast' into refs/top-bases/gcc-branchBrian Behlendorf2009-02-181-9/+9
| | |\ \
| | | * | Pass 0's instead of NULL's which are the same but of the correct typeBrian Behlendorf2009-02-181-9/+9
| | | * | Merge commit 'refs/top-bases/gcc-cast' into gcc-castBrian Behlendorf2009-02-1829-707/+1020
| | | |\ \
| | | * \ \ Merge commit 'refs/top-bases/gcc-cast' into gcc-castBrian Behlendorf2009-01-1539-604/+1094
| | | |\ \ \
* | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-02-1829-708/+1021
|\| | | | | |
| * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-02-1829-708/+1021
| |\| | | | |
| | * | | | | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-02-181-0/+1
| | |\ \ \ \ \
| | | * \ \ \ \ Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-02-1829-707/+1020
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-01-1539-604/+1094
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | * | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-02-1829-709/+1021
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-02-1829-708/+1021
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Rebase master to b108Brian Behlendorf2009-02-1829-707/+1020
| | | | | |/ / | | | | |/| |
* | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-152-11/+0
|\| | | | | |
| * | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-152-11/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'fix-locks' into refs/top-bases/fix-branchBrian Behlendorf2009-01-152-11/+0
| | |\ \ \ \ \ \
| | | * | | | | | All init and destroy initialized pulled inBrian Behlendorf2009-01-151-3/+0
| | | * | | | | | txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different...Brian Behlendorf2009-01-151-8/+0
| | | * | | | | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-1538-604/+1084
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | Merge commit 'refs/top-bases/fix-locks' into fix-locksBrian Behlendorf2008-12-114-0/+21
| | * | | | | | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-1538-604/+1084
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrapBrian Behlendorf2009-01-1539-604/+1094
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-151-1/+1
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-151-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-01-151-1/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Resolve C90 int declared in for() constructBrian Behlendorf2009-01-151-1/+1
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-151-8/+12
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-151-8/+12
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-01-151-8/+12
| | |\| | | | | | |
| | | * | | | | | | Resolve C90 int declared in for() constructBrian Behlendorf2009-01-151-8/+12
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-151-3/+6
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-151-3/+6
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-01-151-3/+6
| | |\| | | | | | |
| | | * | | | | | | Resolve C90 int declared in for() constructBrian Behlendorf2009-01-151-3/+6
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-151-1/+2
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-151-1/+2
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-01-151-1/+2
| | |\| | | | | | |
| | | * | | | | | | Resolve C90 int declared in for() constructBrian Behlendorf2009-01-151-1/+2
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-1538-604/+1084
|\| | | | | | | | |
| * | | | | | | | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-1538-604/+1084
| |\| | | | | | | |
| | * | | | | | | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-1539-604/+1094
| | |\| | | | | | |
| | | * | | | | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-01-1539-604/+1094
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Rebase master to b105Brian Behlendorf2009-01-1539-604/+1094
| | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-131-0/+2
|\| | | | | | | |