Commit Graph

3634 Commits

Author SHA1 Message Date
Brian Behlendorf adf5cfbfc6 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2010-05-18 14:33:22 -07:00
Brian Behlendorf bc99247660 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2010-05-18 14:33:22 -07:00
Brian Behlendorf bdeeae0b62 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2010-05-18 14:33:21 -07:00
Brian Behlendorf 02a7628cae Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2010-05-18 14:33:20 -07:00
Brian Behlendorf 76855f4d2a Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2010-05-18 14:33:19 -07:00
Brian Behlendorf 684177618a Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2010-05-18 14:33:19 -07:00
Brian Behlendorf 4d8f696cf8 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2010-05-18 14:33:18 -07:00
Brian Behlendorf f37b89b7fb Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2010-05-18 14:33:18 -07:00
Brian Behlendorf 81dcedf8d5 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2010-05-18 14:33:17 -07:00
Brian Behlendorf fbc10a8811 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2010-05-18 14:33:16 -07:00
Brian Behlendorf 86e033e6c7 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2010-05-18 14:33:16 -07:00
Brian Behlendorf 9c9ab7f294 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2010-05-18 14:33:15 -07:00
Brian Behlendorf 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
Brian Behlendorf 7c5dac1954 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2010-05-18 14:33:14 -07:00
Brian Behlendorf 4610b5b39c Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-05-18 14:33:13 -07:00
Brian Behlendorf 8f1b7b5022 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-18 14:33:13 -07:00
Brian Behlendorf e9e64f88ca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-18 14:33:08 -07:00
Brian Behlendorf fcbc88d34b Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-05-18 14:33:07 -07:00
Brian Behlendorf 36cb411075 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2010-05-18 14:33:07 -07:00
Brian Behlendorf 17173476aa Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 2010-05-18 14:33:06 -07:00
Brian Behlendorf bd7197fd0b Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-05-18 14:33:04 -07:00
Brian Behlendorf d0680b8155 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-05-18 14:33:03 -07:00
Brian Behlendorf a6a29acd23 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-05-18 14:33:01 -07:00
Brian Behlendorf da79ba3c6d Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-05-18 14:33:00 -07:00
Brian Behlendorf 6837738a53 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2010-05-18 14:32:58 -07:00
Brian Behlendorf c3902f6ef3 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2010-05-18 14:32:57 -07:00
Brian Behlendorf 0bf742359a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2010-05-18 14:32:55 -07:00
Brian Behlendorf c8da3bb68b Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-05-18 14:32:54 -07:00
Brian Behlendorf cf7a3c4af2 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-05-18 14:32:52 -07:00
Brian Behlendorf 02ae622925 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-05-18 14:32:51 -07:00
Brian Behlendorf ddb9f06d75 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-05-18 14:32:49 -07:00
Brian Behlendorf ce10342dd9 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-05-18 14:32:48 -07:00
Brian Behlendorf 62c14ca4ca Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-05-18 14:32:46 -07:00
Brian Behlendorf 9a8060d6f5 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-05-18 14:32:45 -07:00
Brian Behlendorf 91fce49b3b Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-05-18 14:32:43 -07:00
Brian Behlendorf d16fe106c2 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-05-18 14:32:41 -07:00
Brian Behlendorf 4d145474b3 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-05-18 14:32:39 -07:00
Brian Behlendorf ca357527f5 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-05-18 14:32:38 -07:00
Brian Behlendorf 86b3826fdd Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2010-05-18 14:32:37 -07:00
Brian Behlendorf 2ce4f1a664 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2010-05-18 14:32:35 -07:00
Brian Behlendorf 7f2abf3598 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2010-05-18 14:32:34 -07:00
Brian Behlendorf 720315c047 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2010-05-18 14:32:32 -07:00
Brian Behlendorf 5a6dfc1799 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-05-18 14:32:30 -07:00
Brian Behlendorf 888c4e84da Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-05-18 14:32:28 -07:00
Brian Behlendorf 2a60b16620 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-05-18 14:32:27 -07:00
Brian Behlendorf f7f7cdbfee Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-05-18 14:32:25 -07:00
Brian Behlendorf fa94cf43b9 Update COPYRIGHT to reference zpios CDDL exceptions. 2010-05-18 14:25:28 -07:00
Brian Behlendorf 54a2f6988b Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-18 12:31:51 -07:00
Brian Behlendorf 13ad721a84 Move user-arch.m4 change from linux-libspl to zfs-branch. 2010-05-18 12:26:48 -07:00
Brian Behlendorf 4e672cb129 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-18 11:15:04 -07:00