Commit Graph

1433 Commits

Author SHA1 Message Date
Brian Behlendorf 9f57596c78 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-09 14:16:28 -08:00
Brian Behlendorf 4358d79285 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-09 14:16:27 -08:00
Brian Behlendorf ad09e624d8 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-09 14:16:26 -08:00
Brian Behlendorf d4b8a48f81 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-09 14:16:26 -08:00
Brian Behlendorf 10e68eee41 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-09 14:16:25 -08:00
Brian Behlendorf ed67495146 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-09 14:16:24 -08:00
Brian Behlendorf e24c9ae6d4 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-09 14:16:23 -08:00
Brian Behlendorf ac4e8d7252 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-09 14:16:23 -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 34fe60deca Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 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 5c300573f3 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-09 14:16:19 -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 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 0649bd3be4 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-09 14:16:16 -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 104396b70f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-09 14:16:13 -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 9a4aab49e1 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-09 14:16:12 -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 f6ec7597d2 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-09 14:16:10 -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 f422d0eba7 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2008-12-09 14:16:08 -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 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 4eaa3cd683 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-12-09 14:16:03 -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 fff6686328 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-09 14:16:01 -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 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 08a9700ed2 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-09 14:02:10 -08:00
Brian Behlendorf d5b23ff89f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-09 14:02:09 -08:00
Brian Behlendorf 516ea188eb Resolve conflict 2008-12-09 14:02:04 -08:00
Brian Behlendorf a894b59496 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-09 13:59:04 -08:00
Brian Behlendorf 9f39879525 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-09 13:59:03 -08:00
Brian Behlendorf 866265f0a9 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-09 13:59:00 -08:00
Brian Behlendorf 643cea9752 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-09 13:58:58 -08:00
Brian Behlendorf e2da70478a Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-09 13:58:55 -08:00
Brian Behlendorf 8ac6818294 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-09 13:58:54 -08:00
Brian Behlendorf d5b6f2cfee Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-09 13:58:51 -08:00
Brian Behlendorf 06daeefb51 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-09 13:58:49 -08:00