Brian Behlendorf
|
eb811f7fa9
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
|
2009-03-19 20:59:12 -07:00 |
|
Brian Behlendorf
|
54b5b41a58
|
Add 'feature-pthreads' branch to features branch.
|
2009-03-19 20:49:52 -07:00 |
|
Brian Behlendorf
|
8cdcf1ef44
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-03-19 19:49:55 -07:00 |
|
Brian Behlendorf
|
53db4c7b29
|
Revert fix-pthreads moving to feature-pthreads branch
|
2009-03-19 19:43:09 -07:00 |
|
Brian Behlendorf
|
5f30a3cb0e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 11:09:11 -07:00 |
|
Brian Behlendorf
|
8fe801fd8f
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2009-03-11 11:00:42 -07:00 |
Ricardo M. Correia
|
af45030850
|
Added 'gcc-ident-pragmas' branch.
|
2009-03-11 10:59:45 -07:00 |
|
Brian Behlendorf
|
f07f82e93a
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-11 11:26:43 -08:00 |
|
Brian Behlendorf
|
756a122d37
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 11:25:42 -08:00 |
|
Brian Behlendorf
|
4f5d567cfd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 11:24:45 -08:00 |
|
Brian Behlendorf
|
3420896332
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 11:24:42 -08:00 |
|
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |