Brian Behlendorf
|
2a2b1a08a7
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:51 -08:00 |
|
Brian Behlendorf
|
20e4845d0f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 08:52:50 -08:00 |
|
Brian Behlendorf
|
87b4b8b8b7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 08:52:49 -08:00 |
|
Brian Behlendorf
|
fef97db610
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 08:52:44 -08:00 |
|
Brian Behlendorf
|
0632ea7519
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:44 -08:00 |
|
Brian Behlendorf
|
86b3bb18c3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 08:52:43 -08:00 |
|
Brian Behlendorf
|
68f1b9897a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:38 -08:00 |
|
Brian Behlendorf
|
6955ffc56e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 08:52:37 -08:00 |
|
Brian Behlendorf
|
da8fab1481
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:33 -08:00 |
|
Brian Behlendorf
|
d8ce35e47b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 08:52:32 -08:00 |
|
Brian Behlendorf
|
48ba9339c0
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:29 -08:00 |
|
Brian Behlendorf
|
579ce8f9b7
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 08:52:28 -08:00 |
|
Brian Behlendorf
|
fc82e794ef
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:25 -08:00 |
|
Brian Behlendorf
|
690e4461e6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 08:52:24 -08:00 |
|
Brian Behlendorf
|
8afe144546
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:21 -08:00 |
|
Brian Behlendorf
|
b718b79b37
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 08:52:20 -08:00 |
|
Brian Behlendorf
|
8168534188
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:17 -08:00 |
|
Brian Behlendorf
|
61ddb2540c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 08:52:16 -08:00 |
|
Brian Behlendorf
|
9e66117d33
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:13 -08:00 |
|
Brian Behlendorf
|
4b23ec8daa
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 08:52:11 -08:00 |
|
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
|
Brian Behlendorf
|
db2a32417f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:36 -08:00 |
|
Brian Behlendorf
|
ceca9a6705
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 16:57:34 -08:00 |
|
Brian Behlendorf
|
71d07a58ca
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:27 -08:00 |
|
Brian Behlendorf
|
4b674271a9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-11 16:57:25 -08:00 |
|
Brian Behlendorf
|
3861c10c9b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:18 -08:00 |
|
Brian Behlendorf
|
894cf1fb8e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 16:57:16 -08:00 |
|
Brian Behlendorf
|
513a4d1cf9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:10 -08:00 |
|
Brian Behlendorf
|
e205c9425a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 16:57:07 -08:00 |
|
Brian Behlendorf
|
2f9f235a0b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:57:01 -08:00 |
|
Brian Behlendorf
|
28274c469a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 16:56:59 -08:00 |
|
Brian Behlendorf
|
e16e6a52e0
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:56:52 -08:00 |
|
Brian Behlendorf
|
3bc69462ea
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 16:56:50 -08:00 |
|
Brian Behlendorf
|
7b0aea3e5e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:56:43 -08:00 |
|
Brian Behlendorf
|
6b0a5d9826
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 16:56:41 -08:00 |
|
Brian Behlendorf
|
9fdcce798d
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:56:35 -08:00 |
|
Brian Behlendorf
|
de64820d78
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 16:56:32 -08:00 |
|
Brian Behlendorf
|
61c646041b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:56:26 -08:00 |
|
Brian Behlendorf
|
29f0fbfee0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 16:56:24 -08:00 |
|
Brian Behlendorf
|
7fad21f8b0
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:56:17 -08:00 |
|
Brian Behlendorf
|
90be2e9b3c
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 16:56:15 -08:00 |
|
Brian Behlendorf
|
adb9aba83e
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:56:11 -08:00 |
|
Brian Behlendorf
|
d2c1da93ba
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 16:56:10 -08:00 |
|
Brian Behlendorf
|
d1298845df
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 16:56:08 -08:00 |
|
Brian Behlendorf
|
18610c5fc9
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:55:58 -08:00 |
|
Brian Behlendorf
|
ef75c56d37
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 16:55:56 -08:00 |
|
Brian Behlendorf
|
9ddda584c8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 16:55:55 -08:00 |
|
Brian Behlendorf
|
a82246f6c4
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:55:45 -08:00 |
|
Brian Behlendorf
|
ca8c7d4453
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 16:55:43 -08:00 |
|
Brian Behlendorf
|
723b6c0615
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:55:37 -08:00 |