Commit Graph

14538 Commits

Author SHA1 Message Date
Brian Behlendorf c14c59eaa8 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-08-04 15:06:14 -07:00
Brian Behlendorf 46be9b93ed Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-08-04 15:06:04 -07:00
Brian Behlendorf 4ca4040106 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-04 15:06:02 -07:00
Brian Behlendorf 30c9dd27ed Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-08-04 15:05:51 -07:00
Brian Behlendorf 5d11fcf082 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-04 15:05:44 -07:00
Brian Behlendorf 52f7ace2f8 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-08-04 15:05:34 -07:00
Brian Behlendorf 19063534cb Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-04 15:05:32 -07:00
Brian Behlendorf 1834bc0fe3 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 15:05:21 -07:00
Brian Behlendorf 38bd12c937 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-08-04 15:05:19 -07:00
Brian Behlendorf fde4bca587 Tag zfs-0.4.5.
Update the ChangeLog with a summary of the changes since the last release
and update the META file to reflect the new version number.
2009-08-04 14:56:40 -07:00
Brian Behlendorf 4e36682f1d Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-08-04 14:43:59 -07:00
Brian Behlendorf 7a0d2f62ff Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-08-04 14:43:55 -07:00
Brian Behlendorf 75e46afb6c Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-08-04 14:43:45 -07:00
Brian Behlendorf 2f2296bbe5 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-08-04 14:43:42 -07:00
Brian Behlendorf 183b9df0aa Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-08-04 14:43:32 -07:00
Brian Behlendorf ca59cc5c82 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-04 14:43:29 -07:00
Brian Behlendorf 7839f0f507 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-08-04 14:43:19 -07:00
Brian Behlendorf 2f81fca007 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-08-04 14:43:14 -07:00
Brian Behlendorf 14ef80e8d4 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-08-04 14:43:04 -07:00
Brian Behlendorf 5cc3f79553 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-04 14:43:02 -07:00
Brian Behlendorf 16271a41cc Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-08-04 14:42:51 -07:00
Brian Behlendorf 91960068e0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-04 14:42:49 -07:00
Brian Behlendorf 77d86261f6 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-08-04 14:42:38 -07:00
Brian Behlendorf 94fd6b5326 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-04 14:42:33 -07:00
Brian Behlendorf 07feb8dfb6 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-08-04 14:42:22 -07:00
Brian Behlendorf de27eb10c2 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-08-04 14:42:20 -07:00
Brian Behlendorf 03590ed1b0 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-08-04 14:42:09 -07:00
Brian Behlendorf cffdc20142 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-08-04 14:42:07 -07:00
Brian Behlendorf 9c37f7593d Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-08-04 14:41:56 -07:00
Brian Behlendorf b324dc7fd5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-04 14:41:52 -07:00
Brian Behlendorf df0111c738 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-08-04 14:41:41 -07:00
Brian Behlendorf 671a2d1ed9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-04 14:41:39 -07:00
Brian Behlendorf c51341909a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-08-04 14:41:29 -07:00
Brian Behlendorf d160703a9c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-04 14:41:26 -07:00
Brian Behlendorf a0a7b07245 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-08-04 14:41:15 -07:00
Brian Behlendorf a58b4008c5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-04 14:41:12 -07:00
Brian Behlendorf 2665b9a863 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-04 14:41:11 -07:00
Brian Behlendorf e99ebb9037 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-08-04 14:40:52 -07:00
Brian Behlendorf 37f263f244 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-04 14:40:50 -07:00
Brian Behlendorf ed3e845798 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-04 14:40:48 -07:00
Brian Behlendorf 7f1e727449 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-08-04 14:40:23 -07:00
Brian Behlendorf aa980b56d3 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-08-04 14:40:21 -07:00
Brian Behlendorf eb282e1300 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-08-04 14:40:11 -07:00
Brian Behlendorf 65d7bfc8b3 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-08-04 14:40:08 -07:00
Brian Behlendorf 31faa86674 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-08-04 14:39:55 -07:00
Brian Behlendorf 4576ca6889 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-04 14:39:53 -07:00
Brian Behlendorf 125e17a59a Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-08-04 14:39:42 -07:00
Brian Behlendorf 2484ccf4ac Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-04 14:39:40 -07:00
Brian Behlendorf e546bf970f Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-08-04 14:39:29 -07:00
Brian Behlendorf 83a34ce138 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-04 14:39:22 -07:00