Brian Behlendorf
bc23a8b10f
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-06-29 14:41:03 -07:00
Brian Behlendorf
265513616a
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-06-29 14:41:02 -07:00
Brian Behlendorf
c454e517cb
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-06-29 14:41:01 -07:00
Brian Behlendorf
a57da929fe
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-06-29 14:41:00 -07:00
Brian Behlendorf
871fd7e25f
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-06-29 14:41:00 -07:00
Brian Behlendorf
d19cd612c9
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-06-29 14:40:59 -07:00
Brian Behlendorf
3ba72eb48d
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-06-29 14:40:58 -07:00
Brian Behlendorf
3dd109c6d5
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-06-29 14:40:57 -07:00
Brian Behlendorf
1b6477ba12
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-06-29 14:40:56 -07:00
Brian Behlendorf
158ce1ad9f
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-06-29 14:40:55 -07:00
Brian Behlendorf
0aaf6218d1
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-06-29 14:40:55 -07:00
Brian Behlendorf
6f3fa7e640
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-06-29 14:40:54 -07:00
Brian Behlendorf
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
Brian Behlendorf
7cd3299b01
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-29 14:40:49 -07:00
Brian Behlendorf
cd01d1dcdc
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-29 14:40:48 -07:00
Brian Behlendorf
c102394c69
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-06-29 14:40:48 -07:00
Brian Behlendorf
440c31986c
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-06-29 14:40:47 -07:00
Brian Behlendorf
3b628acf9c
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-29 14:40:45 -07:00
Brian Behlendorf
a303b641c0
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-06-29 14:40:44 -07:00
Brian Behlendorf
105026bfc0
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-06-29 14:40:43 -07:00
Brian Behlendorf
fb89ea141a
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-06-29 14:40:42 -07:00
Brian Behlendorf
e146159dcd
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-06-29 14:40:40 -07:00
Brian Behlendorf
4d2b5c1e52
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-06-29 14:40:39 -07:00
Brian Behlendorf
350dd943de
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-06-29 14:40:38 -07:00
Brian Behlendorf
996d43027b
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-06-29 14:40:36 -07:00
Brian Behlendorf
ab4a18fd09
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-29 14:40:35 -07:00
Brian Behlendorf
11ce7ab08f
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-06-29 14:40:34 -07:00
Brian Behlendorf
6f0f7231e3
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-06-29 14:40:32 -07:00
Brian Behlendorf
a1097e9d6f
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-06-29 14:40:31 -07:00
Brian Behlendorf
bd09c31688
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-06-29 14:40:28 -07:00
Brian Behlendorf
15112a9642
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-06-29 14:40:27 -07:00
Brian Behlendorf
26cfa9d270
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-06-29 14:40:26 -07:00
Brian Behlendorf
653589b77a
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-06-29 14:40:25 -07:00
Brian Behlendorf
39b87a2879
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-06-29 14:40:23 -07:00
Brian Behlendorf
cabec2d73c
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-06-29 14:40:22 -07:00
Brian Behlendorf
b27a006df9
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-06-29 14:40:20 -07:00
Brian Behlendorf
c112aa6055
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-06-29 14:40:19 -07:00
Brian Behlendorf
bbe19a8b0e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-29 14:40:17 -07:00
Brian Behlendorf
389425ecd7
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-06-29 14:40:16 -07:00
Brian Behlendorf
1213402460
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-06-29 14:40:15 -07:00
Brian Behlendorf
731c2d1256
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-06-29 14:40:14 -07:00
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
fe14b6802a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-29 13:43:26 -07:00
Brian Behlendorf
82360d2362
Move local variables to heap
...
We were already modifing this function so it would run in the
local development environment, so let's just do the stack fixes
here are well. It's all simple enough.
2010-06-29 13:09:51 -07:00
Brian Behlendorf
ba6f4d661c
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-29 11:37:05 -07:00
Brian Behlendorf
ca61a18b4b
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-29 11:37:03 -07:00
Brian Behlendorf
e9fc10ae18
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:57 -07:00
Brian Behlendorf
371fdb5cf2
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-29 11:36:54 -07:00
Brian Behlendorf
2a8d4a222b
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:49 -07:00