Brian Behlendorf
|
5c530132fc
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:53 -08:00 |
|
Brian Behlendorf
|
3a9ed52a6c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-09 15:11:52 -08:00 |
|
Brian Behlendorf
|
1c0f4043a3
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:49 -08:00 |
|
Brian Behlendorf
|
b8fc1110d1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-09 15:11:48 -08:00 |
|
Brian Behlendorf
|
8752ad0406
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:44 -08:00 |
|
Brian Behlendorf
|
58f4a5a125
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 15:11:43 -08:00 |
|
Brian Behlendorf
|
a387a34087
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:40 -08:00 |
|
Brian Behlendorf
|
fce16fe818
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-09 15:11:38 -08:00 |
|
Brian Behlendorf
|
5430001be9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:35 -08:00 |
|
Brian Behlendorf
|
ade2433834
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-09 15:11:34 -08:00 |
|
Brian Behlendorf
|
1bf31ae438
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:31 -08:00 |
|
Brian Behlendorf
|
d2d018fafa
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-09 15:11:29 -08:00 |
|
Brian Behlendorf
|
e6d67668e9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:26 -08:00 |
|
Brian Behlendorf
|
1fd9167bc0
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 15:11:25 -08:00 |
|
Brian Behlendorf
|
a4beae4c4b
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:21 -08:00 |
|
Brian Behlendorf
|
3061758c0d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 15:11:20 -08:00 |
|
Brian Behlendorf
|
f885b5dc1c
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:17 -08:00 |
|
Brian Behlendorf
|
e86fa83ee6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 15:11:16 -08:00 |
|
Brian Behlendorf
|
7c4463c898
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:12 -08:00 |
|
Brian Behlendorf
|
89cf8c8a67
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 15:11:11 -08:00 |
|
Brian Behlendorf
|
d1c00e78f3
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:08 -08:00 |
|
Brian Behlendorf
|
3f364581cd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 15:11:07 -08:00 |
|
Brian Behlendorf
|
2b195391ee
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 15:11:06 -08:00 |
|
Brian Behlendorf
|
ca43e8cb33
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:01 -08:00 |
|
Brian Behlendorf
|
bcafe37b97
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 15:10:59 -08:00 |
|
Brian Behlendorf
|
aa6c4ff685
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 15:10:59 -08:00 |
|
Brian Behlendorf
|
863a9a7fbd
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:53 -08:00 |
|
Brian Behlendorf
|
8585fdfc59
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-09 15:10:52 -08:00 |
|
Brian Behlendorf
|
ef7adc458b
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:49 -08:00 |
|
Brian Behlendorf
|
3396d6d69e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-09 15:10:47 -08:00 |
|
Brian Behlendorf
|
7c08a51829
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:44 -08:00 |
|
Brian Behlendorf
|
921ebaf7f7
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-09 15:10:43 -08:00 |
|
Brian Behlendorf
|
cdfebdafb3
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:40 -08:00 |
|
Brian Behlendorf
|
193dc509d0
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 15:10:38 -08:00 |
|
Brian Behlendorf
|
1e0a16bbfd
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:35 -08:00 |
|
Brian Behlendorf
|
17767ebc82
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 15:10:34 -08:00 |
|
Brian Behlendorf
|
056f7e7663
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:31 -08:00 |
|
Brian Behlendorf
|
668b10d1e8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-09 15:10:29 -08:00 |
|
Brian Behlendorf
|
522fb18428
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:10:26 -08:00 |
|
Brian Behlendorf
|
18c7d89c62
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 15:10:25 -08:00 |
|
Brian Behlendorf
|
39184ef9b4
|
Only needed by ZPL
|
2009-01-09 15:08:36 -08:00 |
|
Brian Behlendorf
|
6791a1ee34
|
I don't think we need this in userspace
|
2009-01-09 15:07:32 -08:00 |
|
Brian Behlendorf
|
bed94035fd
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:46:42 -08:00 |
|
Brian Behlendorf
|
a7e5f34acb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:46:41 -08:00 |
|
Brian Behlendorf
|
ded1ca7691
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:46:38 -08:00 |
|
Brian Behlendorf
|
ae80ba7fda
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-09 14:46:36 -08:00 |
|
Brian Behlendorf
|
cafd35d37e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:46:33 -08:00 |
|
Brian Behlendorf
|
7af644b8b3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-09 14:46:32 -08:00 |
|
Brian Behlendorf
|
482148aebf
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:46:29 -08:00 |
|
Brian Behlendorf
|
7ea7020636
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 14:46:27 -08:00 |