aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/top-bases/top' into topzfs-0.4.5Brian Behlendorf2009-08-041-3/+0
|\
| * Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-08-041-3/+0
| |\
| | * Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branchBrian Behlendorf2009-08-041-3/+0
| | |\
| | | * Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\
| | | | * Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmapBrian Behlendorf2009-08-041-3/+0
| | | | |\
| | | * | \ Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \
| | | | * \ \ Merge commit 'refs/top-bases/linux-ztest' into linux-ztestBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | * | | | Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \
| | | | * \ \ \ Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zplBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | * | | | | Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge commit 'refs/top-bases/linux-unused' into linux-unusedBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | * | | | | | Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge commit 'refs/top-bases/linux-libspl' into linux-libsplBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | * | | | | | | Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | * | | | | | | | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-user-disk' into linux-user-diskBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | * | | | | | | | | Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-colli...Brian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | * | | | | | | | | | Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-legacy' into linux-legacyBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | * | | | | | | | | | | Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-memBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-diskBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvolBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rwBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopyBrian Behlendorf2009-08-041-3/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-syseventBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-moduleBrian Behlendorf2009-08-041-3/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debugBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntentBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefiBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgtBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fmBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-041-3/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/linux-docs' into linux-docsBrian Behlendorf2009-08-041-3/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | Tag zfs-0.4.5 for realBrian Behlendorf2009-08-041-3/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/top' into topBrian Behlendorf2009-08-046-135/+136
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branchBrian Behlendorf2009-08-046-135/+136
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branchBrian Behlendorf2009-08-046-135/+136
| | |\| | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branchBrian Behlendorf2009-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | |