Brian Behlendorf
|
22f8ca065a
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-14 16:05:21 -08:00 |
|
Brian Behlendorf
|
0d8e925476
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-14 16:05:17 -08:00 |
|
Brian Behlendorf
|
f5780bd385
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-14 16:05:11 -08:00 |
|
Brian Behlendorf
|
37e2d99e39
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-14 16:05:09 -08:00 |
|
Brian Behlendorf
|
c1664f35ce
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-14 16:05:04 -08:00 |
|
Brian Behlendorf
|
6b8dd141cf
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-14 16:05:01 -08:00 |
|
Brian Behlendorf
|
a83f5a00d0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-14 16:04:56 -08:00 |
|
Brian Behlendorf
|
aac79c5329
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-14 16:04:53 -08:00 |
|
Brian Behlendorf
|
616571aae5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-14 16:04:46 -08:00 |
|
Brian Behlendorf
|
9339984f08
|
Resolve conflict
|
2009-01-14 16:04:33 -08:00 |
|
Brian Behlendorf
|
6c5d10c81b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:44:27 -08:00 |
|
Brian Behlendorf
|
b00ebbc449
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-14 15:44:26 -08:00 |
|
Brian Behlendorf
|
ab5d92bd81
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:44:23 -08:00 |
|
Brian Behlendorf
|
a9c4554915
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-14 15:44:21 -08:00 |
|
Brian Behlendorf
|
fd470d5f92
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:44:18 -08:00 |
|
Brian Behlendorf
|
19988d74d6
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-14 15:44:16 -08:00 |
|
Brian Behlendorf
|
fa7b8f5f5a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:44:13 -08:00 |
|
Brian Behlendorf
|
3a4c074fca
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-14 15:44:11 -08:00 |
|
Brian Behlendorf
|
8f86ce6637
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:44:08 -08:00 |
|
Brian Behlendorf
|
3e3980c4d9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-14 15:44:06 -08:00 |
|
Brian Behlendorf
|
1aaae79b18
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:44:03 -08:00 |
|
Brian Behlendorf
|
60b4866a91
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-14 15:44:01 -08:00 |
|
Brian Behlendorf
|
bed6fcb258
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:58 -08:00 |
|
Brian Behlendorf
|
a0af7af510
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 15:43:56 -08:00 |
|
Brian Behlendorf
|
5ad25d78d6
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:53 -08:00 |
|
Brian Behlendorf
|
3ffdb14680
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 15:43:51 -08:00 |
|
Brian Behlendorf
|
9a54db7edf
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 15:43:51 -08:00 |
|
Brian Behlendorf
|
550415c114
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:45 -08:00 |
|
Brian Behlendorf
|
a304926c0b
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 15:43:44 -08:00 |
|
Brian Behlendorf
|
390146458e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-14 15:43:43 -08:00 |
|
Brian Behlendorf
|
f7176dd736
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:37 -08:00 |
|
Brian Behlendorf
|
5e97e17f90
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-14 15:43:36 -08:00 |
|
Brian Behlendorf
|
4b1e14c362
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:32 -08:00 |
|
Brian Behlendorf
|
92d36d50d1
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-14 15:43:31 -08:00 |
|
Brian Behlendorf
|
c8e9534dd4
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:27 -08:00 |
|
Brian Behlendorf
|
8946662029
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-14 15:43:26 -08:00 |
|
Brian Behlendorf
|
2403f0e5df
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:23 -08:00 |
|
Brian Behlendorf
|
fe23ec2be6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-14 15:43:21 -08:00 |
|
Brian Behlendorf
|
774bd59832
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:18 -08:00 |
|
Brian Behlendorf
|
214a65915a
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-14 15:43:16 -08:00 |
|
Brian Behlendorf
|
f27f941154
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-14 15:43:13 -08:00 |
|
Brian Behlendorf
|
82cce2485f
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-14 15:43:11 -08:00 |
|
Brian Behlendorf
|
9e40470aa0
|
Resolve conflict
|
2009-01-14 15:42:28 -08:00 |
|
Brian Behlendorf
|
1406bb78e6
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-14 15:41:05 -08:00 |
|
Brian Behlendorf
|
9c22d76019
|
Minor 'make check' updates
|
2009-01-14 15:38:56 -08:00 |
|
Brian Behlendorf
|
c2ffd0ef60
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-14 14:27:44 -08:00 |
|
Brian Behlendorf
|
1224d8bf5b
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-14 14:27:43 -08:00 |
|
Brian Behlendorf
|
aff2252263
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 14:27:42 -08:00 |
|
Brian Behlendorf
|
96a29baaee
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-14 14:27:38 -08:00 |
|
Brian Behlendorf
|
d880a2af98
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 14:27:37 -08:00 |