summaryrefslogtreecommitdiffstats
path: root/cmd
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2009-01-151-2/+5
|\
| * Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-151-2/+5
| |\
| | * Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-151-2/+5
| | |\
| | | * Fix pthreads prototypeBrian Behlendorf2009-01-151-2/+5
| | | * Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-154-122/+170
| | | |\
| | | * \ Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreadsBrian Behlendorf2009-01-051-664/+0
| | | |\ \
* | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2009-01-151-2/+3
|\| | | | |
| * | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-151-2/+3
| |\| | | |
| | * | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-151-2/+3
| | |\ \ \ \
| | | * \ \ \ Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-01-151-2/+3
| | | |\ \ \ \
| | | | * | | | Resolve C90 int declared in for() constructBrian Behlendorf2009-01-151-2/+3
* | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2009-01-154-122/+170
|\| | | | | | |
| * | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-154-122/+170
| |\| | | | | |
| | * | | | | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-154-122/+170
| | |\| | | | |
| | | * | | | | Resolve conflict with removed cleaner typeBrian Behlendorf2009-01-154-123/+171
| | | |\| | | |
| | | | * | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-01-154-123/+171
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Rebase master to b105Brian Behlendorf2009-01-154-123/+171
| | | | | | |/ | | | | | |/|
* | | | | | | Resolve conflictBrian Behlendorf2009-01-141-0/+3
|\| | | | | |
| * | | | | | Minor 'make check' updatesBrian Behlendorf2009-01-141-0/+3
* | | | | | | Change all instances of kpios to zpiosBrian Behlendorf2009-01-143-38/+38
* | | | | | | Resolve conflictBrian Behlendorf2009-01-055-5/+15
|\| | | | | |
| * | | | | | Add unicode makefile references and supportBrian Behlendorf2009-01-055-5/+15
* | | | | | | Remove zdumpBrian Behlendorf2009-01-051-1/+1
|\| | | | | |
| * | | | | | Remove remaining zdump Makefile referencesBrian Behlendorf2009-01-051-1/+1
* | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2009-01-052-674/+0
|\| | | | | |
| * | | | | | Remove zdump MakefilesBrian Behlendorf2009-01-051-26/+0
| * | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-01-051-648/+0
| |\| | | | |
| | * | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-01-051-648/+0
| | |\| | | |
| | | * | | | Remove zdump.cBrian Behlendorf2009-01-051-648/+0
| | | |\| | |
| | | | * | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-01-051-664/+0
| | | | |\| |
| | | | | * | Remove zdump, it's an unrelateds command which I added simply due to the z* c...Brian Behlendorf2009-01-051-664/+0
* | | | | | | Minimal include setBrian Behlendorf2008-12-231-6/+4
* | | | | | | Minor zpios cleanupBrian Behlendorf2008-12-232-1/+7
* | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2008-12-222-4/+4
|\| | | | | |
| * | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2008-12-221-3/+3
| |\| | | | |
| | * | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-221-1/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Use pthread_Brian Behlendorf2008-12-221-1/+1
| | * | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-221-2/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branchBrian Behlendorf2008-12-221-2/+2
| | | |\ \ \ \
| | | | * | | | Fix castBrian Behlendorf2008-12-221-2/+2
| * | | | | | | Add a needed libBrian Behlendorf2008-12-221-1/+1
* | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2008-12-221-2/+1
|\| | | | | | |
| * | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2008-12-221-2/+1
| |\| | | | | |
| | * | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-221-2/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Update patch carried forward from old releaseBrian Behlendorf2008-12-221-2/+1
* | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpiosBrian Behlendorf2008-12-221-16/+16
|\| | | | | | |
| * | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2008-12-221-16/+16
| |\| | | | | |
| | * | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-221-2/+2
| | |\| | | | |
| | | * | | | | Use pthread versionsBrian Behlendorf2008-12-221-2/+2
| | * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2008-12-221-14/+14
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |