Brian Behlendorf
|
eb5b7ed442
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:28 -08:00 |
|
Brian Behlendorf
|
bd81e10fbf
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 14:29:27 -08:00 |
|
Brian Behlendorf
|
b355609c83
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:24 -08:00 |
|
Brian Behlendorf
|
c060e80947
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 14:29:23 -08:00 |
|
Brian Behlendorf
|
2d09f5c26a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:20 -08:00 |
|
Brian Behlendorf
|
1ad075a9a8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-05 14:29:19 -08:00 |
|
Brian Behlendorf
|
097cdb5a93
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:16 -08:00 |
|
Brian Behlendorf
|
e85775aeaa
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 14:29:14 -08:00 |
|
Brian Behlendorf
|
f2e7ecdc88
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:12 -08:00 |
|
Brian Behlendorf
|
2624771e63
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 14:29:10 -08:00 |
|
Brian Behlendorf
|
f5d34a8f92
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:07 -08:00 |
|
Brian Behlendorf
|
a198620e23
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 14:29:06 -08:00 |
|
Brian Behlendorf
|
b7e8a2b4cb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:29:03 -08:00 |
|
Brian Behlendorf
|
561bf6db3a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 14:29:01 -08:00 |
|
Brian Behlendorf
|
3b9ebf1b19
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:59 -08:00 |
|
Brian Behlendorf
|
c80dcc2dc1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 14:28:57 -08:00 |
|
Brian Behlendorf
|
2596211881
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:54 -08:00 |
|
Brian Behlendorf
|
a1dc943c32
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 14:28:53 -08:00 |
|
Brian Behlendorf
|
6c9fbf3eb8
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:50 -08:00 |
|
Brian Behlendorf
|
c31e0e9e89
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 14:28:49 -08:00 |
|
Brian Behlendorf
|
9546ae3fe8
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:46 -08:00 |
|
Brian Behlendorf
|
48fa5d6c8f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 14:28:44 -08:00 |
|
Brian Behlendorf
|
08fc451940
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:42 -08:00 |
|
Brian Behlendorf
|
74245215c4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 14:28:40 -08:00 |
|
Brian Behlendorf
|
d1c8781815
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 14:28:39 -08:00 |
|
Brian Behlendorf
|
5edbf98e04
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:35 -08:00 |
|
Brian Behlendorf
|
86a7a82c2d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 14:28:34 -08:00 |
|
Brian Behlendorf
|
ec462ce48f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 14:28:33 -08:00 |
|
Brian Behlendorf
|
2c0eb31fd1
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:28 -08:00 |
|
Brian Behlendorf
|
2246d37509
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-05 14:28:27 -08:00 |
|
Brian Behlendorf
|
582bca0081
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:24 -08:00 |
|
Brian Behlendorf
|
9cda65e296
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-05 14:28:22 -08:00 |
|
Brian Behlendorf
|
ebad9c44fe
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:20 -08:00 |
|
Brian Behlendorf
|
000f8580bf
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 14:28:18 -08:00 |
|
Brian Behlendorf
|
c9e292e4a8
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:15 -08:00 |
|
Brian Behlendorf
|
5256559dd6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-05 14:28:14 -08:00 |
|
Brian Behlendorf
|
84900a3e66
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:11 -08:00 |
|
Brian Behlendorf
|
1757c77c88
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 14:28:10 -08:00 |
|
Brian Behlendorf
|
32929e351e
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:07 -08:00 |
|
Brian Behlendorf
|
92b7a4d7e8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-05 14:28:05 -08:00 |
|
Brian Behlendorf
|
79a46ae86d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:02 -08:00 |
|
Brian Behlendorf
|
1ab1e16285
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 14:28:01 -08:00 |
|
Brian Behlendorf
|
a4ecacdad7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 14:28:00 -08:00 |
|
Brian Behlendorf
|
93e72d1102
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 14:27:59 -08:00 |
|
Brian Behlendorf
|
f2d8d8666a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-05 14:27:59 -08:00 |
|
Brian Behlendorf
|
854fda6d70
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-01-05 14:27:58 -08:00 |
|
Brian Behlendorf
|
12ee6d57c8
|
Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true
|
2009-01-05 14:26:16 -08:00 |
|
Brian Behlendorf
|
40a02d3a0d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:14:00 -08:00 |
|
Brian Behlendorf
|
fcacccfb25
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 14:13:59 -08:00 |
|
Brian Behlendorf
|
7722133169
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:13:56 -08:00 |