4d8f696cf8
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-05-18 14:33:18 -07:00
f37b89b7fb
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-05-18 14:33:18 -07:00
81dcedf8d5
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-05-18 14:33:17 -07:00
fbc10a8811
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-05-18 14:33:16 -07:00
86e033e6c7
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-05-18 14:33:16 -07:00
9c9ab7f294
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-05-18 14:33:15 -07:00
ac7032b809
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-05-18 14:33:14 -07:00
7c5dac1954
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-05-18 14:33:14 -07:00
4610b5b39c
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-05-18 14:33:13 -07:00
8f1b7b5022
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-18 14:33:13 -07:00
e9e64f88ca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-18 14:33:08 -07:00
fcbc88d34b
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-05-18 14:33:07 -07:00
36cb411075
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-05-18 14:33:07 -07:00
17173476aa
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-05-18 14:33:06 -07:00
bd7197fd0b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-05-18 14:33:04 -07:00
d0680b8155
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-05-18 14:33:03 -07:00
a6a29acd23
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-05-18 14:33:01 -07:00
da79ba3c6d
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-05-18 14:33:00 -07:00
6837738a53
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-05-18 14:32:58 -07:00
c3902f6ef3
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-05-18 14:32:57 -07:00
0bf742359a
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-05-18 14:32:55 -07:00
c8da3bb68b
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 14:32:54 -07:00
cf7a3c4af2
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-05-18 14:32:52 -07:00
02ae622925
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-05-18 14:32:51 -07:00
ddb9f06d75
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-05-18 14:32:49 -07:00
ce10342dd9
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-05-18 14:32:48 -07:00
62c14ca4ca
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-05-18 14:32:46 -07:00
9a8060d6f5
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-05-18 14:32:45 -07:00
91fce49b3b
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-05-18 14:32:43 -07:00
d16fe106c2
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-05-18 14:32:41 -07:00
4d145474b3
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-05-18 14:32:39 -07:00
ca357527f5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-05-18 14:32:38 -07:00
86b3826fdd
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-05-18 14:32:37 -07:00
2ce4f1a664
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-05-18 14:32:35 -07:00
7f2abf3598
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-05-18 14:32:34 -07:00
720315c047
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-05-18 14:32:32 -07:00
5a6dfc1799
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-05-18 14:32:30 -07:00
888c4e84da
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-05-18 14:32:28 -07:00
2a60b16620
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-05-18 14:32:27 -07:00
f7f7cdbfee
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-05-18 14:32:25 -07:00
fa94cf43b9
Update COPYRIGHT to reference zpios CDDL exceptions.
2010-05-18 14:25:28 -07:00
9d1f0810f4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 12:31:33 -07:00
13ad721a84
Move user-arch.m4 change from linux-libspl to zfs-branch.
2010-05-18 12:26:48 -07:00
a2c57ce830
Update headers to be correct for public release
...
This includes adding the copyright where appropriate, author
attribution, and including the Lawrence Livermore National
Security, LLC release code for new/rewritten files.
2010-05-18 11:31:37 -07:00
2578e519ab
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 11:14:36 -07:00
d115e15d29
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-18 11:14:06 -07:00
c88a793e82
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-18 11:14:05 -07:00
a52727cf3e
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-18 11:14:04 -07:00
78d56178f7
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-18 11:14:04 -07:00
2b170bc4aa
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-05-18 11:14:03 -07:00
Brian Behlendorf