Brian Behlendorf
|
cee3842c8d
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 16:06:35 -08:00 |
|
Brian Behlendorf
|
245faeadf2
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:28 -08:00 |
|
Brian Behlendorf
|
9ac24dd140
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 16:06:26 -08:00 |
|
Brian Behlendorf
|
81369bf5d8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:19 -08:00 |
|
Brian Behlendorf
|
08b0046039
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 16:06:14 -08:00 |
|
Brian Behlendorf
|
8e752abc83
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:08 -08:00 |
|
Brian Behlendorf
|
61c4ad3067
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 16:06:05 -08:00 |
|
Brian Behlendorf
|
8ea2bead50
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:00 -08:00 |
|
Brian Behlendorf
|
b4ec4a0834
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 16:05:54 -08:00 |
|
Brian Behlendorf
|
419cff0fd3
|
Add more more missing headers
|
2008-12-22 16:02:08 -08:00 |
|
Brian Behlendorf
|
575903cb9a
|
Comment out zfs_mount/umount
|
2008-12-22 16:01:04 -08:00 |
|
Brian Behlendorf
|
cf5eae37b3
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:53:01 -08:00 |
|
Brian Behlendorf
|
96473c9eff
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 15:52:59 -08:00 |
|
Brian Behlendorf
|
a545e458c0
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:56 -08:00 |
|
Brian Behlendorf
|
3c5beacfab
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 15:52:54 -08:00 |
|
Brian Behlendorf
|
d26ca6dbe1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:51 -08:00 |
|
Brian Behlendorf
|
bd56b89546
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 15:52:50 -08:00 |
|
Brian Behlendorf
|
b9b512e7d3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:46 -08:00 |
|
Brian Behlendorf
|
ea765bd3c0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 15:52:44 -08:00 |
|
Brian Behlendorf
|
4b56ce49fd
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:41 -08:00 |
|
Brian Behlendorf
|
515c44c49a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 15:52:39 -08:00 |
|
Brian Behlendorf
|
aa3b35cc75
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:36 -08:00 |
|
Brian Behlendorf
|
856299f80b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 15:52:34 -08:00 |
|
Brian Behlendorf
|
9b570821cb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:31 -08:00 |
|
Brian Behlendorf
|
2f61f196ea
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 15:52:29 -08:00 |
|
Brian Behlendorf
|
eeb68060c9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:25 -08:00 |
|
Brian Behlendorf
|
f54f718689
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 15:52:23 -08:00 |
|
Brian Behlendorf
|
0c81e4125b
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:20 -08:00 |
|
Brian Behlendorf
|
b1bdb806a0
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 15:52:18 -08:00 |
|
Brian Behlendorf
|
366124e460
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:15 -08:00 |
|
Brian Behlendorf
|
b7e02896fd
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 15:52:13 -08:00 |
|
Brian Behlendorf
|
ae044bbf31
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:09 -08:00 |
|
Brian Behlendorf
|
96309d6253
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 15:52:08 -08:00 |
|
Brian Behlendorf
|
5b984b0ec6
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:04 -08:00 |
|
Brian Behlendorf
|
dede01fb36
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 15:52:03 -08:00 |
|
Brian Behlendorf
|
f22f5d3250
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 15:52:02 -08:00 |
|
Brian Behlendorf
|
e629c3c3a4
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:57 -08:00 |
|
Brian Behlendorf
|
1080bca7c9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 15:51:55 -08:00 |
|
Brian Behlendorf
|
9ee7fa3dbd
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 15:51:54 -08:00 |
|
Brian Behlendorf
|
36b669a096
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:48 -08:00 |
|
Brian Behlendorf
|
4529e56294
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 15:51:47 -08:00 |
|
Brian Behlendorf
|
76bbf6792e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:43 -08:00 |
|
Brian Behlendorf
|
9ad507e43b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 15:51:42 -08:00 |
|
Brian Behlendorf
|
495feb8eb1
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:38 -08:00 |
|
Brian Behlendorf
|
44d06dc150
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 15:51:36 -08:00 |
|
Brian Behlendorf
|
3c90fe6327
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:33 -08:00 |
|
Brian Behlendorf
|
f4d792c2ad
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 15:51:31 -08:00 |
|
Brian Behlendorf
|
8acde50a85
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:28 -08:00 |
|
Brian Behlendorf
|
b73bbb5e5c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 15:51:26 -08:00 |
|
Brian Behlendorf
|
b3b1ed323f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:23 -08:00 |