Brian Behlendorf
|
3601fb4af0
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:29:19 -08:00 |
|
Brian Behlendorf
|
b7ba234fcc
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-08 10:29:18 -08:00 |
|
Brian Behlendorf
|
6ca07c2415
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:29:14 -08:00 |
|
Brian Behlendorf
|
eba9726539
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-08 10:29:13 -08:00 |
|
Brian Behlendorf
|
955b141421
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:29:09 -08:00 |
|
Brian Behlendorf
|
35612ea106
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-08 10:29:07 -08:00 |
|
Brian Behlendorf
|
797e737159
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:29:04 -08:00 |
|
Brian Behlendorf
|
b7256edf16
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-08 10:29:02 -08:00 |
|
Brian Behlendorf
|
68628e83db
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:59 -08:00 |
|
Brian Behlendorf
|
c88b33ffce
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-08 10:28:57 -08:00 |
|
Brian Behlendorf
|
defee0f55d
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:54 -08:00 |
|
Brian Behlendorf
|
dd069ed4fe
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-08 10:28:52 -08:00 |
|
Brian Behlendorf
|
4cc91e4934
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:49 -08:00 |
|
Brian Behlendorf
|
9d335bca85
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-08 10:28:47 -08:00 |
|
Brian Behlendorf
|
b573210ad0
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:44 -08:00 |
|
Brian Behlendorf
|
c8e036d6fa
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-08 10:28:42 -08:00 |
|
Brian Behlendorf
|
428e68a713
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:39 -08:00 |
|
Brian Behlendorf
|
e1a4af24af
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-08 10:28:37 -08:00 |
|
Brian Behlendorf
|
ca40880f4e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:33 -08:00 |
|
Brian Behlendorf
|
a43e0b50fb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-08 10:28:32 -08:00 |
|
Brian Behlendorf
|
789bbf6cc2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:29 -08:00 |
|
Brian Behlendorf
|
b3ac9208ba
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-08 10:28:27 -08:00 |
|
Brian Behlendorf
|
98e4eb8abd
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-08 10:28:26 -08:00 |
|
Brian Behlendorf
|
05c1cb2c46
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:21 -08:00 |
|
Brian Behlendorf
|
e75b7fa88f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-08 10:28:19 -08:00 |
|
Brian Behlendorf
|
06749d1581
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-08 10:28:18 -08:00 |
|
Brian Behlendorf
|
b055c5903e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:12 -08:00 |
|
Brian Behlendorf
|
fae3d2ed2a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-08 10:28:10 -08:00 |
|
Brian Behlendorf
|
15da1c9132
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:07 -08:00 |
|
Brian Behlendorf
|
456bfebb79
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-08 10:28:05 -08:00 |
|
Brian Behlendorf
|
8db756a802
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:02 -08:00 |
|
Brian Behlendorf
|
c281c15c84
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-08 10:28:00 -08:00 |
|
Brian Behlendorf
|
d8c60bd455
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:27:57 -08:00 |
|
Brian Behlendorf
|
008408a40f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-08 10:27:55 -08:00 |
|
Brian Behlendorf
|
72f92dafd1
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:27:52 -08:00 |
|
Brian Behlendorf
|
318547fbae
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-08 10:27:50 -08:00 |
|
Brian Behlendorf
|
900f51818d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:27:47 -08:00 |
|
Brian Behlendorf
|
195341c0de
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-08 10:27:45 -08:00 |
|
Brian Behlendorf
|
b7d9adb500
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:27:42 -08:00 |
|
Brian Behlendorf
|
23e0e2e59b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-08 10:27:32 -08:00 |
|
Brian Behlendorf
|
b38c50ac45
|
Update vdev_disk.c implementation to be compatible with b103 API
|
2009-01-08 10:25:23 -08:00 |
|
Brian Behlendorf
|
b457fb49f9
|
Remove vdev_disk from userspace build, vdev_file is used
|
2009-01-08 10:23:59 -08:00 |
|
Brian Behlendorf
|
d1398aa4a5
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:53:41 -08:00 |
|
Brian Behlendorf
|
f1cf255273
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-07 15:53:39 -08:00 |
|
Brian Behlendorf
|
2b2970dead
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:53:36 -08:00 |
|
Brian Behlendorf
|
d181addf0c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-07 15:53:34 -08:00 |
|
Brian Behlendorf
|
c406f94a1e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:53:30 -08:00 |
|
Brian Behlendorf
|
4e38d21302
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-07 15:53:28 -08:00 |
|
Brian Behlendorf
|
e58e11bde2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:53:25 -08:00 |
|
Brian Behlendorf
|
a362b45dc6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-07 15:53:23 -08:00 |