Brian Behlendorf
|
bbc92f20e2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:18 -08:00 |
|
Brian Behlendorf
|
3b1550ab3d
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-09 14:56:17 -08:00 |
|
Brian Behlendorf
|
28d944d0ec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:14 -08:00 |
|
Brian Behlendorf
|
38ab72c606
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-09 14:56:12 -08:00 |
|
Brian Behlendorf
|
6c745cd2c8
|
Update libumem Makefile to reflect new realities
|
2008-12-09 14:54:45 -08:00 |
|
Brian Behlendorf
|
a5eeed6da5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:34 -08:00 |
|
Brian Behlendorf
|
f826e7c0dc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:42:32 -08:00 |
|
Brian Behlendorf
|
54dc8286c8
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:29 -08:00 |
|
Brian Behlendorf
|
7a212b6b5e
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 14:42:28 -08:00 |
|
Brian Behlendorf
|
a6309140a3
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:25 -08:00 |
|
Brian Behlendorf
|
364c22b862
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-09 14:42:24 -08:00 |
|
Brian Behlendorf
|
395281141e
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:20 -08:00 |
|
Brian Behlendorf
|
2c2d56c731
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-09 14:42:19 -08:00 |
|
Brian Behlendorf
|
4d47fc986b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:16 -08:00 |
|
Brian Behlendorf
|
a24b77fae9
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-09 14:42:15 -08:00 |
|
Brian Behlendorf
|
55382c2c11
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:12 -08:00 |
|
Brian Behlendorf
|
6413375c7e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-09 14:42:10 -08:00 |
|
Brian Behlendorf
|
9454f74ac7
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:07 -08:00 |
|
Brian Behlendorf
|
c7dec7bdbc
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-09 14:42:06 -08:00 |
|
Brian Behlendorf
|
cb5796b975
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:03 -08:00 |
|
Brian Behlendorf
|
60aebc1ab1
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-09 14:42:01 -08:00 |
|
Brian Behlendorf
|
b235334a39
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:58 -08:00 |
|
Brian Behlendorf
|
bada9ccafb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-09 14:41:57 -08:00 |
|
Brian Behlendorf
|
fff597fd19
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:54 -08:00 |
|
Brian Behlendorf
|
16bc4a19a4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-09 14:41:53 -08:00 |
|
Brian Behlendorf
|
7ac3a84624
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:49 -08:00 |
|
Brian Behlendorf
|
bb5c400bea
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 14:41:48 -08:00 |
|
Brian Behlendorf
|
7a83ce2ade
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 14:41:48 -08:00 |
|
Brian Behlendorf
|
f64e98ae1c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:42 -08:00 |
|
Brian Behlendorf
|
1851c77fb4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-09 14:41:41 -08:00 |
|
Brian Behlendorf
|
cac45d6fbd
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 14:41:41 -08:00 |
|
Brian Behlendorf
|
90414d4f26
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:35 -08:00 |
|
Brian Behlendorf
|
91f774bb36
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 14:41:34 -08:00 |
|
Brian Behlendorf
|
ef70f74d3b
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:31 -08:00 |
|
Brian Behlendorf
|
f810c7ac49
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-09 14:41:29 -08:00 |
|
Brian Behlendorf
|
749ba87f28
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:26 -08:00 |
|
Brian Behlendorf
|
25a1daa490
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-09 14:41:25 -08:00 |
|
Brian Behlendorf
|
8bd6436aff
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:22 -08:00 |
|
Brian Behlendorf
|
309973785f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 14:41:21 -08:00 |
|
Brian Behlendorf
|
7ab752e992
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:18 -08:00 |
|
Brian Behlendorf
|
cc17f5fa8f
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-09 14:41:16 -08:00 |
|
Brian Behlendorf
|
dd09f482c6
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:13 -08:00 |
|
Brian Behlendorf
|
9c4d9ab812
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-09 14:41:12 -08:00 |
|
Brian Behlendorf
|
215172ca4f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:41:09 -08:00 |
|
Brian Behlendorf
|
b07fcec93b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-09 14:41:07 -08:00 |
|
Brian Behlendorf
|
28c0e431c0
|
Refer to moved Makefile
|
2008-12-09 14:39:45 -08:00 |
|
Brian Behlendorf
|
124d182c51
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:27:05 -08:00 |
|
Brian Behlendorf
|
d7604f31b3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:27:04 -08:00 |
|
Brian Behlendorf
|
f059b96b73
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:27:00 -08:00 |
|
Brian Behlendorf
|
099cf52158
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 14:26:59 -08:00 |