4ceec4a504
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-01-15 14:19:18 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
cb2016c3a0
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-01-13 15:02:42 -08:00
4a5bd7a3a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:02:11 -08:00
bec036636e
List cleanup and use of list_node_init initializer
2009-01-13 15:00:12 -08:00
e43153f247
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 11:38:15 -08:00
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
55b0194547
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 12:26:44 -08:00
9ef6211ce7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:23:57 -08:00
b23299c7db
Fix two prototypes in the right place
2008-12-17 12:20:20 -08:00
9a10c42b65
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 11:52:50 -08:00
6a509b3bca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:50:41 -08:00
77811f8236
Fix prototype
2008-12-17 11:48:40 -08:00
4003bc5b2c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-11 11:35:48 -08:00
8aad84f781
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 11:27:12 -08:00
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
8f8ac4288f
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 11:25:09 -08:00
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf