Brian Behlendorf
|
74982df1b4
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:43:47 -08:00 |
|
Brian Behlendorf
|
046eee8c25
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 11:43:45 -08:00 |
|
Brian Behlendorf
|
d63e6259f6
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 11:43:44 -08:00 |
|
Brian Behlendorf
|
6dc6345ae3
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-18 11:43:44 -08:00 |
|
Brian Behlendorf
|
b98891bf17
|
Resolve time conflict
|
2008-12-18 11:41:30 -08:00 |
|
Brian Behlendorf
|
a912deff81
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:40:37 -08:00 |
|
Brian Behlendorf
|
bf2efa9dde
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 11:40:35 -08:00 |
|
Brian Behlendorf
|
b56649ac82
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:40:32 -08:00 |
|
Brian Behlendorf
|
1c2042d778
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 11:40:31 -08:00 |
|
Brian Behlendorf
|
f7d9c9b4ac
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:40:27 -08:00 |
|
Brian Behlendorf
|
2c348839b6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 11:40:26 -08:00 |
|
Brian Behlendorf
|
580057f2d8
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:40:22 -08:00 |
|
Brian Behlendorf
|
31cd18bef6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 11:40:21 -08:00 |
|
Brian Behlendorf
|
de993998b7
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:40:18 -08:00 |
|
Brian Behlendorf
|
c17037eb8d
|
Revert commit_cb feature
|
2008-12-18 11:40:12 -08:00 |
|
Brian Behlendorf
|
9ea19b6cd2
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:45 -08:00 |
|
Brian Behlendorf
|
562e6a49d3
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 11:39:44 -08:00 |
|
Brian Behlendorf
|
64cc5cb599
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:41 -08:00 |
|
Brian Behlendorf
|
a974c42a02
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 11:39:39 -08:00 |
|
Brian Behlendorf
|
aa3215cef4
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:36 -08:00 |
|
Brian Behlendorf
|
caac73b67d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 11:39:34 -08:00 |
|
Brian Behlendorf
|
3c4068ddd8
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:31 -08:00 |
|
Brian Behlendorf
|
0b5b1b5cc0
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 11:39:29 -08:00 |
|
Brian Behlendorf
|
77111539c9
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:26 -08:00 |
|
Brian Behlendorf
|
7b836ab418
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 11:39:24 -08:00 |
|
Brian Behlendorf
|
5d35ca8e32
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:21 -08:00 |
|
Brian Behlendorf
|
f63ea3c521
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 11:39:20 -08:00 |
|
Brian Behlendorf
|
d6043e1141
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:16 -08:00 |
|
Brian Behlendorf
|
60b7c664e0
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 11:39:15 -08:00 |
|
Brian Behlendorf
|
8b46ed9359
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 11:39:14 -08:00 |
|
Brian Behlendorf
|
1e008768d5
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:39:09 -08:00 |
|
Brian Behlendorf
|
944fd8ad8c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 11:39:07 -08:00 |
|
Brian Behlendorf
|
bf57b913fb
|
Revert commit_cb feature
|
2008-12-18 11:39:02 -08:00 |
|
Brian Behlendorf
|
60e2e5c0a3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:38:16 -08:00 |
|
Brian Behlendorf
|
e43153f247
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-18 11:38:15 -08:00 |
|
Brian Behlendorf
|
08be840fe8
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:38:12 -08:00 |
|
Brian Behlendorf
|
c9b5a02a83
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-18 11:38:10 -08:00 |
|
Brian Behlendorf
|
0beec04424
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:38:07 -08:00 |
|
Brian Behlendorf
|
ebabd312bd
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 11:38:05 -08:00 |
|
Brian Behlendorf
|
b5347daa8c
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:38:02 -08:00 |
|
Brian Behlendorf
|
6200d749d7
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-18 11:38:00 -08:00 |
|
Brian Behlendorf
|
43b4d4d2e8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:37:57 -08:00 |
|
Brian Behlendorf
|
53e2d81686
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 11:37:55 -08:00 |
|
Brian Behlendorf
|
af3b779e50
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:37:52 -08:00 |
|
Brian Behlendorf
|
26435d0564
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-18 11:37:50 -08:00 |
|
Brian Behlendorf
|
612f7c20d1
|
Revert commit_cb feature
|
2008-12-18 11:37:08 -08:00 |
|
Brian Behlendorf
|
1c05357f9d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 11:34:27 -08:00 |
|
Brian Behlendorf
|
58645698b4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 11:34:26 -08:00 |
|
Brian Behlendorf
|
9ae2c70438
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-18 11:34:25 -08:00 |
|
Brian Behlendorf
|
053a2fffcf
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-18 11:34:24 -08:00 |