Brian Behlendorf
|
28e4878551
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:38 -08:00 |
|
Brian Behlendorf
|
56f6031652
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 12:54:37 -08:00 |
|
Brian Behlendorf
|
f4b61db156
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:33 -08:00 |
|
Brian Behlendorf
|
bdfff917f3
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 12:54:32 -08:00 |
|
Brian Behlendorf
|
dcc20bf598
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:28 -08:00 |
|
Brian Behlendorf
|
f05cb28506
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 12:54:26 -08:00 |
|
Brian Behlendorf
|
fbe4b1426c
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:23 -08:00 |
|
Brian Behlendorf
|
a40064cfd1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 12:54:21 -08:00 |
|
Brian Behlendorf
|
5c285ea211
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:18 -08:00 |
|
Brian Behlendorf
|
b7770e3b13
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 12:54:16 -08:00 |
|
Brian Behlendorf
|
533031e87f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:13 -08:00 |
|
Brian Behlendorf
|
61afefc4b9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 12:54:11 -08:00 |
|
Brian Behlendorf
|
d7a1171a54
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 12:54:11 -08:00 |
|
Brian Behlendorf
|
6255b8664c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:54:05 -08:00 |
|
Brian Behlendorf
|
18ac7e51ef
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 12:54:04 -08:00 |
|
Brian Behlendorf
|
34f30113a8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 12:54:03 -08:00 |
|
Brian Behlendorf
|
5d04bb2491
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:57 -08:00 |
|
Brian Behlendorf
|
c17709be1c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 12:53:55 -08:00 |
|
Brian Behlendorf
|
23a1f62d74
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:52 -08:00 |
|
Brian Behlendorf
|
30f88fa721
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 12:53:51 -08:00 |
|
Brian Behlendorf
|
9a09e847f4
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:47 -08:00 |
|
Brian Behlendorf
|
195c61d105
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 12:53:46 -08:00 |
|
Brian Behlendorf
|
5cc13c3963
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:42 -08:00 |
|
Brian Behlendorf
|
7077c7f8e3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 12:53:40 -08:00 |
|
Brian Behlendorf
|
7cf169b8de
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:37 -08:00 |
|
Brian Behlendorf
|
5e47788491
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 12:53:35 -08:00 |
|
Brian Behlendorf
|
b40aa9f3c5
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:32 -08:00 |
|
Brian Behlendorf
|
cb6a579089
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 12:53:30 -08:00 |
|
Brian Behlendorf
|
b93191445c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:27 -08:00 |
|
Brian Behlendorf
|
4b2dab73f1
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 12:53:24 -08:00 |
|
Brian Behlendorf
|
121effcbee
|
Pull everything in to the Makefile
|
2008-12-22 12:51:03 -08:00 |
|
Brian Behlendorf
|
bf10d5037a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:42:04 -08:00 |
|
Brian Behlendorf
|
2f4b12b228
|
Add HAVE_ZVOL changes
|
2008-12-22 12:37:43 -08:00 |
|
Brian Behlendorf
|
1e9c6b3020
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:24:47 -08:00 |
|
Brian Behlendorf
|
79491b69f4
|
Start linux-have-zpl layer
|
2008-12-22 12:23:27 -08:00 |
|
Brian Behlendorf
|
a6d6f31db6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:09:08 -08:00 |
|
Brian Behlendorf
|
d7d260b870
|
Removing branch to readd under new name
|
2008-12-22 12:05:11 -08:00 |
|
Brian Behlendorf
|
3533b7ec8c
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:58:27 -08:00 |
|
Brian Behlendorf
|
683dc8d98e
|
Fix up headers
|
2008-12-22 11:54:35 -08:00 |
|
Brian Behlendorf
|
af22b14c12
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:29 -08:00 |
|
Brian Behlendorf
|
0cf01a7c69
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 11:42:28 -08:00 |
|
Brian Behlendorf
|
2f9329e98d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:25 -08:00 |
|
Brian Behlendorf
|
d7fafdb56e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 11:42:23 -08:00 |
|
Brian Behlendorf
|
a5eb7a6291
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:20 -08:00 |
|
Brian Behlendorf
|
9a57b35c98
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:42:18 -08:00 |
|
Brian Behlendorf
|
e999025453
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:15 -08:00 |
|
Brian Behlendorf
|
300ff503d4
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:42:13 -08:00 |
|
Brian Behlendorf
|
8af913c7b9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:10 -08:00 |
|
Brian Behlendorf
|
af113488c1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 11:42:08 -08:00 |
|
Brian Behlendorf
|
6ce555ffbf
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:05 -08:00 |