summaryrefslogtreecommitdiffstats
path: root/module
Commit message (Expand)AuthorAgeFilesLines
* 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 Behlendorf2009-01-054-0/+38476
| | | |\ \
| | | * \ \ Merge commit 'refs/top-bases/fix-locks' into fix-locksBrian Behlendorf2008-12-114-850/+0
| | | |\ \ \
| | | * | | | 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
|\| | | | | | | |
| * | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-131-0/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'fix-list' into refs/top-bases/fix-branchBrian Behlendorf2009-01-131-0/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Initialize list linksBrian Behlendorf2009-01-131-0/+2
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-133-0/+5
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-133-0/+5
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'fix-list' into refs/top-bases/fix-branchBrian Behlendorf2009-01-133-0/+5
| | |\| | | | | | |
| | | * | | | | | | Fix proper list node initializationBrian Behlendorf2009-01-133-0/+5
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-131-1/+1
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-131-1/+1
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'fix-rwlocks' into refs/top-bases/fix-branchBrian Behlendorf2009-01-131-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Additional rw_lock not being initialized cleaned in updated codeBrian Behlendorf2009-01-131-1/+1
| | | * | | | | | | | Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocksBrian Behlendorf2009-01-054-0/+38476
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocksBrian Behlendorf2008-12-114-850/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | * | | | | | | | Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocksBrian Behlendorf2008-12-112-3/+3
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-133-3/+8
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-133-3/+8
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'fix-list' into refs/top-bases/fix-branchBrian Behlendorf2009-01-133-3/+8
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |