Brian Behlendorf
|
32035d5de0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:38 -08:00 |
|
Brian Behlendorf
|
2d229bfff3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-23 13:50:36 -08:00 |
|
Brian Behlendorf
|
31f1be4eda
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:33 -08:00 |
|
Brian Behlendorf
|
4a0b1e550a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:50:31 -08:00 |
|
Brian Behlendorf
|
200d97ca81
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:28 -08:00 |
|
Brian Behlendorf
|
c587f81e4a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-23 13:50:26 -08:00 |
|
Brian Behlendorf
|
dfd2808cbe
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:23 -08:00 |
|
Brian Behlendorf
|
900ccaf1c1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-23 13:50:22 -08:00 |
|
Brian Behlendorf
|
379c22ac3a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:19 -08:00 |
|
Brian Behlendorf
|
d95dc1aadd
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-23 13:50:17 -08:00 |
|
Brian Behlendorf
|
cd676c7750
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:14 -08:00 |
|
Brian Behlendorf
|
191a41a5fc
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-23 13:50:13 -08:00 |
|
Brian Behlendorf
|
6327d9e0a9
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:09 -08:00 |
|
Brian Behlendorf
|
6f596265c6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 13:50:08 -08:00 |
|
Brian Behlendorf
|
269832cb06
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:05 -08:00 |
|
Brian Behlendorf
|
55dd786189
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 13:50:03 -08:00 |
|
Brian Behlendorf
|
485818546a
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:50:00 -08:00 |
|
Brian Behlendorf
|
1786fcf52f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-23 13:49:59 -08:00 |
|
Brian Behlendorf
|
d92640af02
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:56 -08:00 |
|
Brian Behlendorf
|
0a963fa1b8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
6b88c17a8f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
25f7877da6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:49 -08:00 |
|
Brian Behlendorf
|
8d0db59e56
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 13:49:47 -08:00 |
|
Brian Behlendorf
|
39953e7eb3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 13:49:47 -08:00 |
|
Brian Behlendorf
|
8b64419412
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:41 -08:00 |
|
Brian Behlendorf
|
b215a5d6ec
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-23 13:49:40 -08:00 |
|
Brian Behlendorf
|
130d02d8d7
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:37 -08:00 |
|
Brian Behlendorf
|
e3adfe9407
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-23 13:49:35 -08:00 |
|
Brian Behlendorf
|
a936a75de3
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:32 -08:00 |
|
Brian Behlendorf
|
003a253cc9
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-23 13:49:31 -08:00 |
|
Brian Behlendorf
|
20ec09a21c
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:28 -08:00 |
|
Brian Behlendorf
|
d6f818bde8
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-23 13:49:27 -08:00 |
|
Brian Behlendorf
|
cc4853667d
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:24 -08:00 |
|
Brian Behlendorf
|
df4f48d419
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-23 13:49:22 -08:00 |
|
Brian Behlendorf
|
cbc2c00f9a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:19 -08:00 |
|
Brian Behlendorf
|
6a3b9d8c8a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-23 13:49:18 -08:00 |
|
Brian Behlendorf
|
b491d69122
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:15 -08:00 |
|
Brian Behlendorf
|
fab76a0411
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-23 13:49:13 -08:00 |
|
Brian Behlendorf
|
ffb8773241
|
Take out page map functions for now
|
2008-12-23 13:47:22 -08:00 |
|
Brian Behlendorf
|
de6b729e33
|
Add Makefile tweak
|
2008-12-23 13:44:15 -08:00 |
|
Brian Behlendorf
|
98b26723a2
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:14:28 -08:00 |
|
Brian Behlendorf
|
5c0c083ad9
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 13:14:27 -08:00 |
|
Brian Behlendorf
|
bc336c4b7f
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:14:24 -08:00 |
|
Brian Behlendorf
|
0b45a00831
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-23 13:14:22 -08:00 |
|
Brian Behlendorf
|
346623d46b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:14:19 -08:00 |
|
Brian Behlendorf
|
7c5e8341ec
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-23 13:14:18 -08:00 |
|
Brian Behlendorf
|
1da01a376c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:14:15 -08:00 |
|
Brian Behlendorf
|
ad75ceca9b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:14:13 -08:00 |
|
Brian Behlendorf
|
c2aeb6a282
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:14:10 -08:00 |
|
Brian Behlendorf
|
549de88dc1
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-23 13:14:09 -08:00 |