bc23a8b10f
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-06-29 14:41:03 -07:00
16c1ad17e9
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-06-29 14:41:03 -07:00
265513616a
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-06-29 14:41:02 -07:00
c454e517cb
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-06-29 14:41:01 -07:00
a57da929fe
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-06-29 14:41:00 -07:00
871fd7e25f
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-06-29 14:41:00 -07:00
d19cd612c9
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-06-29 14:40:59 -07:00
3ba72eb48d
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-06-29 14:40:58 -07:00
3dd109c6d5
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-06-29 14:40:57 -07:00
1b6477ba12
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-06-29 14:40:56 -07:00
158ce1ad9f
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-06-29 14:40:55 -07:00
0aaf6218d1
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-06-29 14:40:55 -07:00
6f3fa7e640
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-06-29 14:40:54 -07:00
8c01d40a93
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-06-29 14:40:53 -07:00
7cd3299b01
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-29 14:40:49 -07:00
cd01d1dcdc
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-29 14:40:48 -07:00
c102394c69
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-06-29 14:40:48 -07:00
440c31986c
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-06-29 14:40:47 -07:00
3b628acf9c
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-29 14:40:45 -07:00
a303b641c0
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-06-29 14:40:44 -07:00
105026bfc0
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-06-29 14:40:43 -07:00
fb89ea141a
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-06-29 14:40:42 -07:00
e146159dcd
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-06-29 14:40:40 -07:00
4d2b5c1e52
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-06-29 14:40:39 -07:00
350dd943de
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-06-29 14:40:38 -07:00
996d43027b
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-06-29 14:40:36 -07:00
ab4a18fd09
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-29 14:40:35 -07:00
11ce7ab08f
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-06-29 14:40:34 -07:00
6f0f7231e3
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-06-29 14:40:32 -07:00
a1097e9d6f
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-06-29 14:40:31 -07:00
bd09c31688
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-06-29 14:40:28 -07:00
15112a9642
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-06-29 14:40:27 -07:00
26cfa9d270
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-06-29 14:40:26 -07:00
653589b77a
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-06-29 14:40:25 -07:00
39b87a2879
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-06-29 14:40:23 -07:00
cabec2d73c
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-06-29 14:40:22 -07:00
b27a006df9
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-06-29 14:40:20 -07:00
c112aa6055
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-06-29 14:40:19 -07:00
bbe19a8b0e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-29 14:40:17 -07:00
389425ecd7
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-06-29 14:40:16 -07:00
1213402460
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-06-29 14:40:15 -07:00
731c2d1256
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-06-29 14:40:14 -07:00
b3c82b1b18
Add basic README
...
A simple README with a short summary of the project and a link
directing people to the online documentation.
2010-06-29 14:35:21 -07:00
e689338d50
Remove README
...
This file is being updated, renamed README.markdown, and moved to
the master branch for githubs benefit.
2010-06-29 14:34:13 -07:00
9fddfa2212
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-29 11:36:13 -07:00
5fd2bd24a7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 11:34:38 -07:00
a0796cadf7
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-06-29 11:34:31 -07:00
ed1d1a7957
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-29 11:28:37 -07:00
0efc05dd6f
Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch
2010-06-29 11:28:36 -07:00
865478a113
Update dependency fix-pthreads changes to fix-stack-ztest
...
This was done becaese fix-stack-ztest was added to the stack
in series after fix-pthreads because fix-stack-ztest depends
on many of the pthreads changes.
2010-06-29 11:27:33 -07:00
Brian Behlendorf