Commit Graph

193 Commits

Author SHA1 Message Date
Brian Behlendorf b9fe30002e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 13:03:57 -08:00
Brian Behlendorf e41d37c49d Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 13:03:56 -08:00
Brian Behlendorf fafeacb53f Resolve shadow conflict 2008-12-17 13:01:56 -08:00
Brian Behlendorf ad58c411bc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-17 12:47:47 -08:00
Brian Behlendorf 863ec76ff7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 12:45:53 -08:00
Brian Behlendorf 941e464645 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 12:45:52 -08:00
Brian Behlendorf a1b865abee Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 12:45:51 -08:00
Brian Behlendorf da718dd80a Resolve shadow conflict 2008-12-17 12:42:17 -08:00
Brian Behlendorf e885dd3a7d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-17 12:29:14 -08:00
Brian Behlendorf 5fa2d90840 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 12:23:59 -08:00
Brian Behlendorf 9ef6211ce7 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 12:23:57 -08:00
Brian Behlendorf e2a977c404 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 12:23:55 -08:00
Brian Behlendorf b23299c7db Fix two prototypes in the right place 2008-12-17 12:20:20 -08:00
Brian Behlendorf 3278f7b38d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-17 12:16:26 -08:00
Brian Behlendorf 385d51ad69 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:50:42 -08:00
Brian Behlendorf 6a509b3bca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:50:41 -08:00
Brian Behlendorf 3719c4146d Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 11:50:40 -08:00
Brian Behlendorf 77811f8236 Fix prototype 2008-12-17 11:48:40 -08:00
Brian Behlendorf a2d1d32c17 move vdev_disk to it's new home 2008-12-11 15:26:36 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf 4bc4fbeb38 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 14:25:29 -08:00
Brian Behlendorf 208f59182a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 14:25:28 -08:00
Brian Behlendorf b8294b1311 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:05 -08:00
Brian Behlendorf 022db7f816 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 14:25:01 -08:00
Brian Behlendorf 9af6637db5 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 14:24:57 -08:00
Brian Behlendorf c325ac879c Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 14:24:56 -08:00
Brian Behlendorf 3e2988aa8b Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 14:24:50 -08:00
Brian Behlendorf 82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf 9b3c631dbd Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 14:24:48 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf 8aad84f781 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 11:27:12 -08:00
Brian Behlendorf e152d6e601 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 11:27:10 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -08:00
Brian Behlendorf cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf b342e90e44 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 11:24:51 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00