Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 1 | -2/+5 |
|\ | |||||
| * | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -2/+5 |
| |\ | |||||
| | * | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -2/+5 |
| | |\ | |||||
| | | * | Fix pthreads prototype | Brian Behlendorf | 2009-01-15 | 1 | -2/+5 |
| | | * | Resolve conflict with removed cleaner type | Brian Behlendorf | 2009-01-15 | 4 | -122/+170 |
| | | |\ | |||||
| | | * \ | Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads | Brian Behlendorf | 2009-01-05 | 1 | -664/+0 |
| | | |\ \ | |||||
* | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 1 | -2/+3 |
|\| | | | | | |||||
| * | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -2/+3 |
| |\| | | | | |||||
| | * | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -2/+3 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-01-15 | 1 | -2/+3 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Resolve C90 int declared in for() construct | Brian Behlendorf | 2009-01-15 | 1 | -2/+3 |
* | | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 4 | -122/+170 |
|\| | | | | | | | |||||
| * | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 4 | -122/+170 |
| |\| | | | | | | |||||
| | * | | | | | | Resolve conflict with removed cleaner type | Brian Behlendorf | 2009-01-15 | 4 | -122/+170 |
| | |\| | | | | | |||||
| | | * | | | | | Resolve conflict with removed cleaner type | Brian Behlendorf | 2009-01-15 | 4 | -123/+171 |
| | | |\| | | | | |||||
| | | | * | | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 | Brian Behlendorf | 2009-01-15 | 4 | -123/+171 |
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| | | |||||
| | | | | * | | | Rebase master to b105 | Brian Behlendorf | 2009-01-15 | 4 | -123/+171 |
| | | | | | |/ | | | | | |/| | |||||
* | | | | | | | Resolve conflict | Brian Behlendorf | 2009-01-14 | 1 | -0/+3 |
|\| | | | | | | |||||
| * | | | | | | Minor 'make check' updates | Brian Behlendorf | 2009-01-14 | 1 | -0/+3 |
* | | | | | | | Change all instances of kpios to zpios | Brian Behlendorf | 2009-01-14 | 3 | -38/+38 |
* | | | | | | | Resolve conflict | Brian Behlendorf | 2009-01-05 | 5 | -5/+15 |
|\| | | | | | | |||||
| * | | | | | | Add unicode makefile references and support | Brian Behlendorf | 2009-01-05 | 5 | -5/+15 |
* | | | | | | | Remove zdump | Brian Behlendorf | 2009-01-05 | 1 | -1/+1 |
|\| | | | | | | |||||
| * | | | | | | Remove remaining zdump Makefile references | Brian Behlendorf | 2009-01-05 | 1 | -1/+1 |
* | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-05 | 2 | -674/+0 |
|\| | | | | | | |||||
| * | | | | | | Remove zdump Makefiles | Brian Behlendorf | 2009-01-05 | 1 | -26/+0 |
| * | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-05 | 1 | -648/+0 |
| |\| | | | | | |||||
| | * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-05 | 1 | -648/+0 |
| | |\| | | | | |||||
| | | * | | | | Remove zdump.c | Brian Behlendorf | 2009-01-05 | 1 | -648/+0 |
| | | |\| | | | |||||
| | | | * | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 | Brian Behlendorf | 2009-01-05 | 1 | -664/+0 |
| | | | |\| | | |||||
| | | | | * | | Remove zdump, it's an unrelateds command which I added simply due to the z* c... | Brian Behlendorf | 2009-01-05 | 1 | -664/+0 |
* | | | | | | | Minimal include set | Brian Behlendorf | 2008-12-23 | 1 | -6/+4 |
* | | | | | | | Minor zpios cleanup | Brian Behlendorf | 2008-12-23 | 2 | -1/+7 |
* | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2008-12-22 | 2 | -4/+4 |
|\| | | | | | | |||||
| * | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -3/+3 |
| |\| | | | | | |||||
| | * | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Use pthread_ | Brian Behlendorf | 2008-12-22 | 1 | -1/+1 |
| | * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch | Brian Behlendorf | 2008-12-22 | 1 | -2/+2 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix cast | Brian Behlendorf | 2008-12-22 | 1 | -2/+2 |
| * | | | | | | | Add a needed lib | Brian Behlendorf | 2008-12-22 | 1 | -1/+1 |
* | | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2008-12-22 | 1 | -2/+1 |
|\| | | | | | | | |||||
| * | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -2/+1 |
| |\| | | | | | | |||||
| | * | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -2/+1 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | * | | | | | Update patch carried forward from old release | Brian Behlendorf | 2008-12-22 | 1 | -2/+1 |
* | | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2008-12-22 | 1 | -16/+16 |
|\| | | | | | | | |||||
| * | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -16/+16 |
| |\| | | | | | | |||||
| | * | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -2/+2 |
| | |\| | | | | | |||||
| | | * | | | | | Use pthread versions | Brian Behlendorf | 2008-12-22 | 1 | -2/+2 |
| | * | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2008-12-22 | 1 | -14/+14 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | |