Commit Graph

970 Commits

Author SHA1 Message Date
Brian Behlendorf e24c9ae6d4 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-09 14:16:23 -08:00
Brian Behlendorf 34fe60deca Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-09 14:16:22 -08:00
Brian Behlendorf 63f396db56 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-09 14:16:22 -08:00
Brian Behlendorf 954c00b5db Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-09 14:16:21 -08:00
Brian Behlendorf 13a9c19edc Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-09 14:16:20 -08:00
Brian Behlendorf f68f5df9f2 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-09 14:16:19 -08:00
Brian Behlendorf 5c300573f3 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-09 14:16:19 -08:00
Brian Behlendorf 91984f82e2 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-09 14:16:18 -08:00
Brian Behlendorf bad1b71540 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-09 14:16:17 -08:00
Brian Behlendorf 4f70aaec1a Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-09 14:16:16 -08:00
Brian Behlendorf 0649bd3be4 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-09 14:16:16 -08:00
Brian Behlendorf ae6fea997f Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-09 14:16:13 -08:00
Brian Behlendorf 104396b70f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-09 14:16:13 -08:00
Brian Behlendorf 1ea4f359ed Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-09 14:16:12 -08:00
Brian Behlendorf 9a4aab49e1 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-09 14:16:12 -08:00
Brian Behlendorf 36931c1ae4 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-09 14:16:10 -08:00
Brian Behlendorf f6ec7597d2 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-09 14:16:10 -08:00
Brian Behlendorf 2e7fdf751f Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-09 14:16:08 -08:00
Brian Behlendorf f422d0eba7 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2008-12-09 14:16:08 -08:00
Brian Behlendorf 2054a20751 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2008-12-09 14:16:07 -08:00
Brian Behlendorf 849ebdc632 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-09 14:16:06 -08:00
Brian Behlendorf 5acb0b8f17 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-09 14:16:05 -08:00
Brian Behlendorf 23818c2a8a Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-09 14:16:04 -08:00
Brian Behlendorf e9c099ddd4 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-09 14:16:03 -08:00
Brian Behlendorf 4eaa3cd683 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-12-09 14:16:03 -08:00
Brian Behlendorf cd24f8b154 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-09 14:16:01 -08:00
Brian Behlendorf fff6686328 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-09 14:16:01 -08:00
Brian Behlendorf 1897a51dc7 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-09 14:16:00 -08:00
Brian Behlendorf 99028a91ec Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-09 14:15:59 -08:00
Brian Behlendorf 98c1df5b37 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-09 14:15:58 -08:00
Brian Behlendorf e3afcb6227 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-09 14:15:57 -08:00
Brian Behlendorf 5e97ed8493 Move vmem* to libumem 2008-12-09 14:14:00 -08:00
Brian Behlendorf 277e990ba9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-09 13:58:45 -08:00
Brian Behlendorf 1654a48217 Build system update 2008-12-09 13:46:53 -08:00
Brian Behlendorf b8f71d0b33 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-09 13:43:09 -08:00
Brian Behlendorf cc5274f04e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 13:41:02 -08:00
Brian Behlendorf 65849deb31 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-09 13:41:01 -08:00
Brian Behlendorf c909deb811 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-09 13:41:01 -08:00
Brian Behlendorf 9936555889 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-09 13:41:00 -08:00
Brian Behlendorf 941a7bf937 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-09 13:41:00 -08:00
Brian Behlendorf e727920ebd Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-09 13:40:59 -08:00
Brian Behlendorf 2a048e0dce Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-09 13:40:59 -08:00
Brian Behlendorf e31fa9cc3c Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-09 13:40:57 -08:00
Brian Behlendorf 854bdb3f8b Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-09 13:40:56 -08:00
Brian Behlendorf 234b2feb58 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-09 13:40:56 -08:00
Brian Behlendorf 69ff734e85 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-09 13:40:55 -08:00
Brian Behlendorf 538286725a Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-09 13:40:54 -08:00
Brian Behlendorf 167dda7135 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-09 13:40:54 -08:00
Brian Behlendorf 0625326f01 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-09 13:40:52 -08:00
Brian Behlendorf 4a591c4d96 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-09 13:40:52 -08:00