Brian Behlendorf
|
1e5df957e9
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:39:26 -08:00 |
|
Brian Behlendorf
|
1b3283ab65
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-21 11:39:24 -08:00 |
|
Brian Behlendorf
|
94e448564d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:39:21 -08:00 |
|
Brian Behlendorf
|
57f89e598c
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-21 11:39:19 -08:00 |
|
Brian Behlendorf
|
a30c56ed35
|
Prep for 0.4.1 tag
|
2009-01-21 11:37:12 -08:00 |
|
Brian Behlendorf
|
528de2563f
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:30:21 -08:00 |
|
Brian Behlendorf
|
f27f2e8850
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-21 11:30:20 -08:00 |
|
Brian Behlendorf
|
bcd70bad5d
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:30:16 -08:00 |
|
Brian Behlendorf
|
ffda87fd7c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-21 11:30:15 -08:00 |
|
Brian Behlendorf
|
575e1aab7b
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:30:11 -08:00 |
|
Brian Behlendorf
|
3468776b99
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-21 11:30:09 -08:00 |
|
Brian Behlendorf
|
fa0707a67e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:30:06 -08:00 |
|
Brian Behlendorf
|
089dae2e2c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-21 11:30:04 -08:00 |
|
Brian Behlendorf
|
b88af9f22e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:30:01 -08:00 |
|
Brian Behlendorf
|
a830a69cb3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-21 11:29:59 -08:00 |
|
Brian Behlendorf
|
cc00538de9
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:56 -08:00 |
|
Brian Behlendorf
|
7ac2fd2e24
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-21 11:29:54 -08:00 |
|
Brian Behlendorf
|
97bc1c24d5
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:51 -08:00 |
|
Brian Behlendorf
|
b7de720a66
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-21 11:29:49 -08:00 |
|
Brian Behlendorf
|
814530ee1a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:45 -08:00 |
|
Brian Behlendorf
|
a602960a98
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-21 11:29:44 -08:00 |
|
Brian Behlendorf
|
7d41a5b3a7
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:40 -08:00 |
|
Brian Behlendorf
|
bfad806a30
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-21 11:29:39 -08:00 |
|
Brian Behlendorf
|
1962107ffd
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:35 -08:00 |
|
Brian Behlendorf
|
84f00fdeb0
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-21 11:29:33 -08:00 |
|
Brian Behlendorf
|
e3c19e6036
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:30 -08:00 |
|
Brian Behlendorf
|
a44f4aab6a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-21 11:29:28 -08:00 |
|
Brian Behlendorf
|
682f704a0f
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:25 -08:00 |
|
Brian Behlendorf
|
7dbcb90d26
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-21 11:29:23 -08:00 |
|
Brian Behlendorf
|
701810dc6f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:20 -08:00 |
|
Brian Behlendorf
|
47802f4afc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-21 11:29:18 -08:00 |
|
Brian Behlendorf
|
4cee20b087
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-21 11:29:17 -08:00 |
|
Brian Behlendorf
|
675cdc2ef6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:12 -08:00 |
|
Brian Behlendorf
|
5389080071
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-21 11:29:10 -08:00 |
|
Brian Behlendorf
|
ef39ff845b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-21 11:29:10 -08:00 |
|
Brian Behlendorf
|
fb6e5d4e77
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:29:04 -08:00 |
|
Brian Behlendorf
|
ba4bbe2511
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-21 11:29:02 -08:00 |
|
Brian Behlendorf
|
af444bf9db
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:28:58 -08:00 |
|
Brian Behlendorf
|
45a09b9b5e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-21 11:28:56 -08:00 |
|
Brian Behlendorf
|
b1e680c49d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:28:53 -08:00 |
|
Brian Behlendorf
|
7bd3fbad05
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-21 11:28:51 -08:00 |
|
Brian Behlendorf
|
4c18632f88
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:28:48 -08:00 |
|
Brian Behlendorf
|
cd761bad0c
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-21 11:28:46 -08:00 |
|
Brian Behlendorf
|
967f7d930d
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:28:43 -08:00 |
|
Brian Behlendorf
|
2673285038
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-21 11:28:41 -08:00 |
|
Brian Behlendorf
|
5faa68f541
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:28:37 -08:00 |
|
Brian Behlendorf
|
3b80be0d53
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-21 11:28:36 -08:00 |
|
Brian Behlendorf
|
a8f294fadc
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:28:32 -08:00 |
|
Brian Behlendorf
|
e208467b02
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-21 11:28:26 -08:00 |
|
Brian Behlendorf
|
5d233af2da
|
Add TODO
|
2009-01-21 11:26:19 -08:00 |