Brian Behlendorf
|
fe23f773a7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 16:58:20 -08:00 |
|
Brian Behlendorf
|
609f9fdd9a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:58:15 -08:00 |
|
Brian Behlendorf
|
ee1ca98846
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 16:58:12 -08:00 |
|
Brian Behlendorf
|
c6cd6b1ed7
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:58:07 -08:00 |
|
Brian Behlendorf
|
83e5f5766c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 16:58:05 -08:00 |
|
Brian Behlendorf
|
2a0358231d
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:58:01 -08:00 |
|
Brian Behlendorf
|
112f6ade2a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 16:57:58 -08:00 |
|
Brian Behlendorf
|
847e05fbf8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:57:52 -08:00 |
|
Brian Behlendorf
|
563c1cde82
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 16:57:50 -08:00 |
|
Brian Behlendorf
|
5f63253ff4
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:57:43 -08:00 |
|
Brian Behlendorf
|
9c9c929712
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 16:57:42 -08:00 |
|
Brian Behlendorf
|
b57e8f3432
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:57:36 -08:00 |
|
Brian Behlendorf
|
736b014c79
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 16:57:33 -08:00 |
|
Brian Behlendorf
|
ab1cafff33
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:57:28 -08:00 |
|
Brian Behlendorf
|
9cae6594d2
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 16:57:25 -08:00 |
|
Brian Behlendorf
|
52d27df150
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:57:20 -08:00 |
|
Brian Behlendorf
|
766d6638fb
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 16:57:17 -08:00 |
|
Brian Behlendorf
|
125e96faba
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 16:57:16 -08:00 |
|
Brian Behlendorf
|
ee6254fb3b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:57:07 -08:00 |
|
Brian Behlendorf
|
b1854e2ac5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 16:57:05 -08:00 |
|
Brian Behlendorf
|
cf964c715e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 16:57:04 -08:00 |
|
Brian Behlendorf
|
f3c9b449c7
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:53 -08:00 |
|
Brian Behlendorf
|
82aeba5d3d
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 16:56:51 -08:00 |
|
Brian Behlendorf
|
2e38d5b7fd
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:44 -08:00 |
|
Brian Behlendorf
|
0da0fa918e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 16:56:42 -08:00 |
|
Brian Behlendorf
|
91eea5f662
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:35 -08:00 |
|
Brian Behlendorf
|
489409adf2
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 16:56:33 -08:00 |
|
Brian Behlendorf
|
38350108c3
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:27 -08:00 |
|
Brian Behlendorf
|
b8d37fd38d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 16:56:25 -08:00 |
|
Brian Behlendorf
|
3551b976f3
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:19 -08:00 |
|
Brian Behlendorf
|
dc0f92ccb8
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 16:56:18 -08:00 |
|
Brian Behlendorf
|
aec594cd16
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:12 -08:00 |
|
Brian Behlendorf
|
6b5ea2eb52
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 16:56:09 -08:00 |
|
Brian Behlendorf
|
4bbb394a8a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:03 -08:00 |
|
Brian Behlendorf
|
e7788edbfd
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 16:56:00 -08:00 |
|
Brian Behlendorf
|
fdffe91056
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:55:59 -08:00 |
|
Brian Behlendorf
|
0844495710
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:55:58 -08:00 |
|
Brian Behlendorf
|
76a831e0af
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 16:55:56 -08:00 |
|
Brian Behlendorf
|
f6c152354f
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 16:55:55 -08:00 |
|
Brian Behlendorf
|
f3d55cb4f5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:55:52 -08:00 |
|
Brian Behlendorf
|
0b6064c023
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 16:55:51 -08:00 |
|
Brian Behlendorf
|
30b961af2c
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 16:55:50 -08:00 |
|
Brian Behlendorf
|
3a76148338
|
Add a needed lib
|
2008-12-22 16:52:26 -08:00 |
|
Brian Behlendorf
|
9ef0280a5c
|
Use pthread_
|
2008-12-22 16:51:28 -08:00 |
|
Brian Behlendorf
|
683f0b1d6c
|
Fix cast
|
2008-12-22 16:50:44 -08:00 |
|
Brian Behlendorf
|
5c546cde18
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:43:38 -08:00 |
|
Brian Behlendorf
|
434ab381c8
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 16:43:35 -08:00 |
|
Brian Behlendorf
|
7709006828
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:43:29 -08:00 |
|
Brian Behlendorf
|
7b91a64f55
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 16:43:26 -08:00 |
|
Brian Behlendorf
|
a73f248a2c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:43:19 -08:00 |