Brian Behlendorf
|
7842143168
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:09:09 -07:00 |
|
Brian Behlendorf
|
f03ec3ce62
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-08-04 15:09:05 -07:00 |
|
Brian Behlendorf
|
1426a63c31
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:08:54 -07:00 |
|
Brian Behlendorf
|
8c1b861ba9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-08-04 15:08:52 -07:00 |
|
Brian Behlendorf
|
71879f555d
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:08:41 -07:00 |
|
Brian Behlendorf
|
71aa5fd850
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-08-04 15:08:39 -07:00 |
|
Brian Behlendorf
|
20bb3fe62e
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:08:29 -07:00 |
|
Brian Behlendorf
|
58c12640d5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-08-04 15:08:26 -07:00 |
|
Brian Behlendorf
|
5cf56498b1
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:08:16 -07:00 |
|
Brian Behlendorf
|
48c94a9ee6
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-08-04 15:08:14 -07:00 |
|
Brian Behlendorf
|
a2d606d9a3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:08:03 -07:00 |
|
Brian Behlendorf
|
510ef9a73f
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-08-04 15:08:00 -07:00 |
|
Brian Behlendorf
|
c1fef98dc6
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:07:49 -07:00 |
|
Brian Behlendorf
|
118c1e9bfe
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-08-04 15:07:43 -07:00 |
|
Brian Behlendorf
|
4698de691a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:07:32 -07:00 |
|
Brian Behlendorf
|
16ff69498d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-08-04 15:07:29 -07:00 |
|
Brian Behlendorf
|
f12d24bae7
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:07:19 -07:00 |
|
Brian Behlendorf
|
4f7b910831
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-08-04 15:07:17 -07:00 |
|
Brian Behlendorf
|
7c8d0f9ba3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-08-04 15:07:15 -07:00 |
|
Brian Behlendorf
|
5fecf827d7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:06:53 -07:00 |
|
Brian Behlendorf
|
b431cac99a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-08-04 15:06:51 -07:00 |
|
Brian Behlendorf
|
af46f00862
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-08-04 15:06:50 -07:00 |
|
Brian Behlendorf
|
bff56decfd
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:06:31 -07:00 |
|
Brian Behlendorf
|
f01c1271b9
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-08-04 15:06:28 -07:00 |
|
Brian Behlendorf
|
be80a56ec7
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:06:17 -07:00 |
|
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 |